diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2 index c92385994c..2b43db9efb 100644 --- a/ansible/roles/neutron/templates/ml2_conf.ini.j2 +++ b/ansible/roles/neutron/templates/ml2_conf.ini.j2 @@ -72,7 +72,7 @@ extensions = {{ neutron_agent_extensions|map(attribute='name')|join(',') }} {% endif %} [ovs] -{% if inventory_hostname in groups["network"] or (inventory_hostname in groups["compute"] and computes_need_external_bridge ) %} +{% if inventory_hostname in groups["network"] or (inventory_hostname in groups["compute"] and computes_need_external_bridge | bool ) %} bridge_mappings = {% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %} {% endif %} diff --git a/ansible/roles/neutron/templates/ml2_conf_xenapi.ini.j2 b/ansible/roles/neutron/templates/ml2_conf_xenapi.ini.j2 index 51ebabc60a..51e822bdbf 100644 --- a/ansible/roles/neutron/templates/ml2_conf_xenapi.ini.j2 +++ b/ansible/roles/neutron/templates/ml2_conf_xenapi.ini.j2 @@ -12,7 +12,7 @@ root_helper = [ovs] of_listen_address = {{ os_xenapi_variables.domu_himn_ip }} ovsdb_connection = tcp:{{ xenserver_himn_ip }}:{{ ovsdb_port }} -{% if computes_need_external_bridge %} +{% if computes_need_external_bridge | bool %} bridge_mappings = {% for interface in neutron_external_interface.split(',') %}physnet{{ loop.index0 + 1 }}:{{ os_xenapi_variables.domu_vifs[interface]["bridge"] }}{% if not loop.last %},{% endif %}{% endfor %} {% else %} bridge_mappings = diff --git a/ansible/roles/openvswitch/handlers/main.yml b/ansible/roles/openvswitch/handlers/main.yml index d631076ea1..0654ecd0d3 100644 --- a/ansible/roles/openvswitch/handlers/main.yml +++ b/ansible/roles/openvswitch/handlers/main.yml @@ -38,7 +38,7 @@ changed_when: status.stdout.find('changed') != -1 when: - inventory_hostname in groups["network"] - or (inventory_hostname in groups["compute"] and computes_need_external_bridge) + or (inventory_hostname in groups["compute"] and computes_need_external_bridge | bool ) with_together: - "{{ neutron_bridge_name.split(',') }}" - "{{ neutron_external_interface.split(',') }}"