diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-13 17:01:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-13 17:01:17 +0000 |
| commit | 45f45400028316aafdf9ddd9ac7db766f2ad04cc (patch) | |
| tree | 435d7b6d4e1c8b3ea7a035a937f150944c4b90ba /ansible | |
| parent | a101a4484c1e953bca981908b199f6c0b64fe1a8 (diff) | |
| parent | 1706e17ae921ec436410b9824433c1805506a1a1 (diff) | |
| download | kolla-45f45400028316aafdf9ddd9ac7db766f2ad04cc.tar.gz kolla-45f45400028316aafdf9ddd9ac7db766f2ad04cc.zip | |
Merge "Fix template for multiple physical networks"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/neutron/templates/ml2_conf.ini.j2 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2 index 27e98137f..f304d023e 100644 --- a/ansible/roles/neutron/templates/ml2_conf.ini.j2 +++ b/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 }} |