remove external_bridge=br-ex from neutron config files

Change-Id: Iec7f202ef5aba753cb6f88db1999a80fc4564208
JIRA: COMPASS-61

diff --git a/deploy/adapters/ansible/roles/neutron-compute/templates/l3_agent.ini b/deploy/adapters/ansible/roles/neutron-compute/templates/l3_agent.ini
index b394c00..5f49934 100644 (file)
--- a/deploy/adapters/ansible/roles/neutron-compute/templates/l3_agent.ini
+++ b/deploy/adapters/ansible/roles/neutron-compute/templates/l3_agent.ini
@@ -45,7 +45,7 @@ handle_internal_only_routers = True
 # Name of bridge used for external network traffic. This should be set to
 # empty value for the linux bridge. when this parameter is set, each L3 agent
 # can be associated with no more than one external network.
-external_network_bridge = br-ex
+external_network_bridge =
 
 # TCP Port used by Neutron metadata server
 metadata_port = 9697

diff --git a/deploy/adapters/ansible/roles/neutron-controller/templates/l3_agent.ini b/deploy/adapters/ansible/roles/neutron-controller/templates/l3_agent.ini
index b394c00..5f49934 100644 (file)
--- a/deploy/adapters/ansible/roles/neutron-controller/templates/l3_agent.ini
+++ b/deploy/adapters/ansible/roles/neutron-controller/templates/l3_agent.ini
@@ -45,7 +45,7 @@ handle_internal_only_routers = True
 # Name of bridge used for external network traffic. This should be set to
 # empty value for the linux bridge. when this parameter is set, each L3 agent
 # can be associated with no more than one external network.
-external_network_bridge = br-ex
+external_network_bridge =
 
 # TCP Port used by Neutron metadata server
 metadata_port = 9697

diff --git a/deploy/adapters/ansible/roles/neutron-network/templates/l3_agent.ini b/deploy/adapters/ansible/roles/neutron-network/templates/l3_agent.ini
index b394c00..5f49934 100644 (file)
--- a/deploy/adapters/ansible/roles/neutron-network/templates/l3_agent.ini
+++ b/deploy/adapters/ansible/roles/neutron-network/templates/l3_agent.ini
@@ -45,7 +45,7 @@ handle_internal_only_routers = True
 # Name of bridge used for external network traffic. This should be set to
 # empty value for the linux bridge. when this parameter is set, each L3 agent
 # can be associated with no more than one external network.
-external_network_bridge = br-ex
+external_network_bridge =
 
 # TCP Port used by Neutron metadata server
 metadata_port = 9697

diff --git a/deploy/adapters/ansible/roles/nova-controller/templates/l3_agent.ini b/deploy/adapters/ansible/roles/nova-controller/templates/l3_agent.ini
index b394c00..5f49934 100644 (file)
--- a/deploy/adapters/ansible/roles/nova-controller/templates/l3_agent.ini
+++ b/deploy/adapters/ansible/roles/nova-controller/templates/l3_agent.ini
@@ -45,7 +45,7 @@ handle_internal_only_routers = True
 # Name of bridge used for external network traffic. This should be set to
 # empty value for the linux bridge. when this parameter is set, each L3 agent
 # can be associated with no more than one external network.
-external_network_bridge = br-ex
+external_network_bridge =
 
 # TCP Port used by Neutron metadata server
 metadata_port = 9697