Merge "Check volume group exists for Cinder in prechecks"

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"

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

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

etc/kolla/globals.yml

@@ -187,10 +187,7 @@ kolla_internal_vip_address: "10.10.10.254"
 # Enable / disable Cinder backends
 #cinder_backend_ceph: "{{ enable_ceph }}"
 
-# Cinder's iSCSI backend !!!REQUIRES!!! two parameters:
-# 1 - IP address of the server hosting LVM Volume group
-# 2 - The name of Volume group which Cinder will use.
-#cinder_volume_group:
+#cinder_volume_group: "cinder-volumes"
 
 
 #######################

releasenotes/notes/add-cinder-vg-check-c70d9f79d8cfd09b.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - When Cinder, iSCSI and the LVM driver are enabled, check that the
+    appropriate volume group exists on the target nodes.