aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-27 10:50:58 +0000
committerGerrit Code Review <review@openstack.org>2015-07-27 10:50:58 +0000
commit9219cefbaf1b014fa67a9fb21b45ccc28181e27d (patch)
treea83317983f9fd0f6e08fd3996a1843951e68d4de /ansible
parent3b394581ab52bb476cdc9bed0ec1e95e0ce43669 (diff)
parent005ec9ee70ef7137ada7963bc65549bab690c9f0 (diff)
downloadkolla-9219cefbaf1b014fa67a9fb21b45ccc28181e27d.tar.gz
kolla-9219cefbaf1b014fa67a9fb21b45ccc28181e27d.zip
Merge "Update init-runonce"
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/neutron/templates/ml2_conf.ini.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2
index 561ea3323..fde37c159 100644
--- a/ansible/roles/neutron/templates/ml2_conf.ini.j2
+++ b/ansible/roles/neutron/templates/ml2_conf.ini.j2
@@ -10,7 +10,7 @@ mechanism_drivers = openvswitch,l2population
#network_vlan_ranges = external:1000:1999
[ml2_type_flat]
-flat_networks = external
+flat_networks = physnet1
[ml2_type_gre]
tunnel_id_ranges = 1:1000
@@ -32,4 +32,4 @@ arp_responder = true
[ovs]
local_ip = {{ hostvars[inventory_hostname]['ansible_' + tunnel_interface]['ipv4']['address'] }}
-bridge_mappings = external:{{ neutron_bridge_name }}
+bridge_mappings = physnet1:{{ neutron_bridge_name }}