openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Allow setting computes_need_external_bridge." into stable/queens

This commit is contained in:
Zuul 2018-05-11 02:55:15 +00:00 committed by Gerrit Code Review
parent c5c1ed8225 3c8343a41c
commit 2b6705a487
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/neutron/templates/ml2_conf.ini.j2
View File

@ -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 %}

2
ansible/roles/neutron/templates/ml2_conf_xenapi.ini.j2
View File

@ -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 =

2
ansible/roles/openvswitch/handlers/main.yml
View File

@ -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(',') }}"