diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-13 18:35:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-13 18:35:00 +0000 |
| commit | 78f1564ed808d5aeaba8fa5f320e5dc95242483b (patch) | |
| tree | 754ec9454df9e34aa15ceffc4fe76ccd0ecc32ca | |
| parent | 671e7f1eb69f521d686fdd8b02977e9d140a5571 (diff) | |
| parent | 233090300ea4acee033f64bd7975c7031aaf8cfb (diff) | |
| download | kolla-78f1564ed808d5aeaba8fa5f320e5dc95242483b.tar.gz kolla-78f1564ed808d5aeaba8fa5f320e5dc95242483b.zip | |
Merge "Check volume group exists for Cinder in prechecks"
| -rw-r--r-- | ansible/roles/cinder/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/cinder/templates/cinder.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/prechecks/tasks/service_checks.yml | 10 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 5 | ||||
| -rw-r--r-- | releasenotes/notes/add-cinder-vg-check-c70d9f79d8cfd09b.yaml | 4 |
5 files changed, 18 insertions, 5 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 diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index cd9177766..541587495 100644 --- a/etc/kolla/globals.yml +++ b/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" ####################### diff --git a/releasenotes/notes/add-cinder-vg-check-c70d9f79d8cfd09b.yaml b/releasenotes/notes/add-cinder-vg-check-c70d9f79d8cfd09b.yaml new file mode 100644 index 000000000..e77a38543 --- /dev/null +++ b/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. |