aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/cinder/defaults/main.yml2
-rw-r--r--ansible/roles/cinder/templates/cinder.conf.j22
-rw-r--r--ansible/roles/prechecks/tasks/service_checks.yml10
3 files changed, 13 insertions, 1 deletions
diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml
index e06b161bc..c9de204ee 100644
--- a/ansible/roles/cinder/defaults/main.yml
+++ b/ansible/roles/cinder/defaults/main.yml
@@ -73,3 +73,5 @@ cinder_backends:
enabled: "{{ enable_cinder_backend_lvm | bool }}"
cinder_enabled_backends: "{{ cinder_backends|selectattr('enabled', 'equalto', true)|list }}"
+
+cinder_volume_group: "cinder-volumes"
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 311033dd8..a34ee75fd 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -79,7 +79,7 @@ lock_path = /var/lib/cinder/tmp
{% if enable_cinder_backend_lvm | bool %}
[lvm-1]
-volume_group = cinder-volumes
+volume_group = {{ cinder_volume_group }}
volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver
volume_backend_name = lvm-1
iscsi_helper = tgtadm
diff --git a/ansible/roles/prechecks/tasks/service_checks.yml b/ansible/roles/prechecks/tasks/service_checks.yml
index b4e7ca99c..06c9b8e32 100644
--- a/ansible/roles/prechecks/tasks/service_checks.yml
+++ b/ansible/roles/prechecks/tasks/service_checks.yml
@@ -64,3 +64,13 @@
- enable_ceilometer | bool
- not enable_mongodb | bool
- ceilometer_database_type == "mongodb"
+
+- name: Checking LVM volume group exists for Cinder
+ command: "vgs {{ cinder_volume_group }}"
+ register: result
+ changed_when: false
+ failed_when: result | failed
+ when:
+ - inventory_hostname in groups['cinder-volume']
+ - enable_cinder | bool
+ - enable_cinder_backend_lvm | bool