Skip to content
Snippets Groups Projects
Commit 52d4458b authored by Mark Goddard's avatar Mark Goddard
Browse files

Sync enable flag defaults with kolla ansible

* Cinder ZFSSA backend was dropped in Xena
* iscsid is no longer required for Ironic since the Ironic iscsi deploy
  interface was removed in Xena

Change-Id: Ia9ade04b1aa9ad102e637d2ddf638b28b2d11305
parent 37a9e870
No related branches found
No related tags found
No related merge requests found
...@@ -522,9 +522,8 @@ kolla_enable_blazar: "no" ...@@ -522,9 +522,8 @@ kolla_enable_blazar: "no"
kolla_enable_ceilometer: "no" kolla_enable_ceilometer: "no"
kolla_enable_central_logging: "no" kolla_enable_central_logging: "no"
kolla_enable_cinder: "no" kolla_enable_cinder: "no"
kolla_enable_cinder_backend_iscsi: "{{ kolla_enable_cinder_backend_lvm | bool or kolla_enable_cinder_backend_zfssa_iscsi | bool }}" kolla_enable_cinder_backend_iscsi: "{{ kolla_enable_cinder_backend_lvm | bool }}"
kolla_enable_cinder_backend_lvm: "no" kolla_enable_cinder_backend_lvm: "no"
kolla_enable_cinder_backend_zfssa_iscsi: "no"
kolla_enable_cloudkitty: "no" kolla_enable_cloudkitty: "no"
kolla_enable_collectd: "no" kolla_enable_collectd: "no"
kolla_enable_cyborg: "no" kolla_enable_cyborg: "no"
...@@ -541,7 +540,7 @@ kolla_enable_influxdb: "{{ kolla_enable_monasca | bool or kolla_enable_cloudkitt ...@@ -541,7 +540,7 @@ kolla_enable_influxdb: "{{ kolla_enable_monasca | bool or kolla_enable_cloudkitt
kolla_enable_ironic_ipxe: "no" kolla_enable_ironic_ipxe: "no"
kolla_enable_ironic: "no" kolla_enable_ironic: "no"
kolla_enable_ironic_neutron_agent: "{{ kolla_enable_neutron | bool and kolla_enable_ironic | bool }}" kolla_enable_ironic_neutron_agent: "{{ kolla_enable_neutron | bool and kolla_enable_ironic | bool }}"
kolla_enable_iscsid: "{{ (kolla_enable_cinder | bool and kolla_enable_cinder_backend_iscsi | bool) or kolla_enable_ironic | bool }}" kolla_enable_iscsid: "{{ kolla_enable_cinder | bool and kolla_enable_cinder_backend_iscsi | bool }}"
kolla_enable_kafka: "{{ kolla_enable_monasca | bool }}" kolla_enable_kafka: "{{ kolla_enable_monasca | bool }}"
kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_monasca | bool else 'no' }}" kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_monasca | bool else 'no' }}"
kolla_enable_kuryr: "no" kolla_enable_kuryr: "no"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment