aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormgatien <m.gatien@gmail.com>2016-06-03 14:40:23 -0400
committerMarc-Andre Gatien <m.gatien@gmail.com>2016-06-03 14:59:05 -0400
commit5fdd2b18cc12715bed41ad3d689528c577d0842b (patch)
tree70210a6b91b8247a8ab07e1edd1c785c8565a1d9
parentad71352a93f68830e480334fec8c817e7c2675fc (diff)
downloadkolla-5fdd2b18cc12715bed41ad3d689528c577d0842b.tar.gz
kolla-5fdd2b18cc12715bed41ad3d689528c577d0842b.zip
adding else statement with empty string
starting ansible 2.X it require a else statement. Closes-bug: #1588941 Change-Id: I3f12be8de75ddcebf28a077c361a9206b36aafb0
-rw-r--r--ansible/group_vars/all.yml11
1 files changed, 5 insertions, 6 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 8aeabcaaa..32aae6c83 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -239,12 +239,11 @@ kibana_user: "kibana"
#################################
# Cinder - Block Storage options
#################################
-cinder_volume_driver: "{{ 'ceph' if enable_ceph | bool }}"
-cinder_volume_driver: "{{ 'lvm' if enable_iscsi | bool }}"
-cinder_volume_group: "{{ 'cinder-volumes' if enable_iscsi | bool }}"
-cinder_volume_backend_name: "{{ 'cinder-volumes' if enable_iscsi | bool }}"
-cinder_iscsi_helper: "{{ 'tgtadm' if enable_iscsi | bool }}"
-cinder_iscsi_protocol: "{{ 'iscsi' if enable_iscsi | bool }}"
+cinder_volume_driver: "{{ 'ceph' if enable_ceph | bool else 'lvm' }}"
+cinder_volume_group: "{{ 'cinder-volumes' if enable_iscsi | bool else '' }}"
+cinder_volume_backend_name: "{{ 'cinder-volumes' if enable_iscsi | bool else '' }}"
+cinder_iscsi_helper: "{{ 'tgtadm' if enable_iscsi | bool else '' }}"
+cinder_iscsi_protocol: "{{ 'iscsi' if enable_iscsi | bool else '' }}"
###################
# Ceph options