Merge "Allow setting computes_need_external_bridge." into stable/queens
This commit is contained in:
commit
2b6705a487
|
@ -72,7 +72,7 @@ extensions = {{ neutron_agent_extensions|map(attribute='name')|join(',') }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
[ovs]
|
[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 %}
|
bridge_mappings = {% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ root_helper =
|
||||||
[ovs]
|
[ovs]
|
||||||
of_listen_address = {{ os_xenapi_variables.domu_himn_ip }}
|
of_listen_address = {{ os_xenapi_variables.domu_himn_ip }}
|
||||||
ovsdb_connection = tcp:{{ xenserver_himn_ip }}:{{ ovsdb_port }}
|
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 %}
|
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 %}
|
{% else %}
|
||||||
bridge_mappings =
|
bridge_mappings =
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
changed_when: status.stdout.find('changed') != -1
|
changed_when: status.stdout.find('changed') != -1
|
||||||
when:
|
when:
|
||||||
- inventory_hostname in groups["network"]
|
- 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:
|
with_together:
|
||||||
- "{{ neutron_bridge_name.split(',') }}"
|
- "{{ neutron_bridge_name.split(',') }}"
|
||||||
- "{{ neutron_external_interface.split(',') }}"
|
- "{{ neutron_external_interface.split(',') }}"
|
||||||
|
|
Loading…
Reference in New Issue