openstack
/
kolla
Code Issues Proposed changes

adding else statement with empty string 

starting ansible 2.X it require a else statement.

Closes-bug: #1588941
Change-Id: I3f12be8de75ddcebf28a077c361a9206b36aafb0
This commit is contained in:
mgatien 2016-06-03 14:40:23 -04:00 committed by Marc-Andre Gatien
parent ad71352a93
commit 5fdd2b18cc
No known key found for this signature in database
GPG Key ID: E55767BE5A11FA7D
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ansible/group_vars/all.yml
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