Merge "adding else statement with empty string starting ansible 2.X it require a else statement."

This commit is contained in:
Jenkins 2016-06-04 02:39:29 +00:00 committed by Gerrit Code Review
commit f43a2ecf38

View File

@ -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