openstack/kolla-ansible
Code Issues Proposed changes

Fix template for multiple physical networks

Browse Source 
This patch [1] adds support to config multiple physical networks for
ovs neutron plugin, but it missed to change ml2_conf.ini.j2
correspondingly.

[1]: https://review.openstack.org/#/c/373455/

Change-Id: I1937e1e5986657470add07d4bcf8587642aa45ec
Closes-bug: #1631903
This commit is contained in:
liyingjun 2016-09-28 14:35:24 +08:00 committed by Praveen N
parent 622c88ec99
commit 1706e17ae9
1 changed files with 3 additions and 2 deletions

5
ansible/roles/neutron/templates/ml2_conf.ini.j2

@ -30,7 +30,7 @@ network_vlan_ranges =
{% if enable_ironic | bool %}
flat_networks = *
{% else %}
flat_networks = physnet1
flat_networks = {% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}{% if not loop.last %},{% endif %}{% endfor %}
{% endif %}
[ml2_type_vxlan]
@ -55,7 +55,8 @@ enable_distributed_routing = True
{% endif %}
[ovs]
bridge_mappings = physnet1:{{ neutron_bridge_name }}
bridge_mappings = {% for bridge in neutron_bridge_name.split(',') %}physnet{{ loop.index0 + 1 }}:{{ bridge }}{% if not loop.last %},{% endif %}{% endfor %}
ovsdb_connection = tcp:{{ api_interface_address }}:6640
{% if enable_nova_fake | bool %}
integration_bridge = br-int-{{ item }}