Merge "Sync enable flag defaults with kolla ansible"

ansible/group_vars/all/kolla

@@ -522,9 +522,8 @@ kolla_enable_blazar: "no"
 kolla_enable_ceilometer: "no"
 kolla_enable_central_logging: "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_zfssa_iscsi: "no"
 kolla_enable_cloudkitty: "no"
 kolla_enable_collectd: "no"
 kolla_enable_cyborg: "no"
@@ -541,7 +540,7 @@ kolla_enable_influxdb: "{{ kolla_enable_monasca | bool or kolla_enable_cloudkitt
 kolla_enable_ironic_ipxe: "no"
 kolla_enable_ironic: "no"
 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_kibana: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_monasca | bool else 'no' }}"
 kolla_enable_kuryr: "no"