summaryrefslogtreecommitdiff
path: root/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-04-10 09:03:34 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2015-04-10 12:06:02 +0000
commit45f722fd724409e32279d8ea1c98746ce98a82db (patch)
treedd1be1030d2ed241144e3ef0185559f9da6b69ec /openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
parent1536fab93f73aa002374eaa32beca9c562bea4cd (diff)
downloaddefinitions-45f722fd724409e32279d8ea1c98746ce98a82db.tar.gz
openstack: Strip out complicated network config
For onenode purposes we only need one bridge, and for multi-node we need more configuration that we haven't yet defined. Plus, because we have Physnet1:br-eth1 in the config we end up making a loop inside our machines, which in some circumstances can cause a loop in the external network, which is a BAD THING! Change-Id: Ia765d48fd4e24fa73325ab992bbad8d3c217d111
Diffstat (limited to 'openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini')
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
index 78d938b9..8880471a 100644
--- a/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
@@ -79,7 +79,7 @@ enable_ipset = True
[ovs]
local_ip = {{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
enable_tunneling = True
-bridge_mappings=External:br-ex,Physnet1:br-eth1
+bridge_mappings=External:br-ex
[agent]
tunnel_types = gre