openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix template for multiple physical networks"

Browse Source
This commit is contained in:
Jenkins 2016-10-13 17:01:17 +00:00 committed by Gerrit Code Review
commit 45f4540002
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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