diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-04 02:39:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-04 02:39:29 +0000 |
| commit | f43a2ecf380b19d31072e87a6d8ba2442763f2b2 (patch) | |
| tree | 1f1397c08bc4f9b1b38cebf5b1b00ffdbdfe0e1c | |
| parent | cb1e665a8abeb1219cfba59410de872e7afadb6a (diff) | |
| parent | 5fdd2b18cc12715bed41ad3d689528c577d0842b (diff) | |
| download | kolla-f43a2ecf380b19d31072e87a6d8ba2442763f2b2.tar.gz kolla-f43a2ecf380b19d31072e87a6d8ba2442763f2b2.zip | |
Merge "adding else statement with empty string starting ansible 2.X it require a else statement."
| -rw-r--r-- | ansible/group_vars/all.yml | 11 |
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 |