diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 8aeabcaaaa..32aae6c831 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