diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 75b622c63f..afe2f2b688 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -648,7 +648,7 @@ enable_ironic: "no" enable_ironic_ipxe: "no" enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool }}" enable_ironic_pxe_uefi: "no" -enable_iscsid: "{{ (enable_cinder | bool and enable_cinder_backend_iscsi | bool) or enable_ironic | bool }}" +enable_iscsid: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}" enable_kafka: "{{ enable_monasca | bool }}" enable_kuryr: "no" enable_magnum: "no" diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 14f0fcd4e3..157dbe8587 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -347,7 +347,7 @@ #enable_ironic_ipxe: "no" #enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool }}" #enable_ironic_pxe_uefi: "no" -#enable_iscsid: "{{ (enable_cinder | bool and enable_cinder_backend_iscsi | bool) or enable_ironic | bool }}" +#enable_iscsid: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}" #enable_kafka: "{{ enable_monasca | bool }}" #enable_kibana: "{{ 'yes' if enable_central_logging | bool or enable_monasca | bool else 'no' }}" #enable_kuryr: "no"