summaryrefslogtreecommitdiffstats
path: root/deploy/adapters
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2015-09-18 17:29:38 +0800
committercarey.xu <carey.xuhan@huawei.com>2015-09-18 17:29:38 +0800
commit952e99a21501899b5e2615443fd1518b9d316b2e (patch)
treece5df273155f7aa926c458d821d64e1adab434c1 /deploy/adapters
parentaf6052d8722989d1604d51450200859a3af7998a (diff)
remove external_bridge=br-ex from neutron config files
Change-Id: Iec7f202ef5aba753cb6f88db1999a80fc4564208 JIRA: COMPASS-61
Diffstat (limited to 'deploy/adapters')
-rw-r--r--deploy/adapters/ansible/roles/neutron-compute/templates/l3_agent.ini2
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/templates/l3_agent.ini2
-rw-r--r--deploy/adapters/ansible/roles/neutron-network/templates/l3_agent.ini2
-rw-r--r--deploy/adapters/ansible/roles/nova-controller/templates/l3_agent.ini2
4 files changed, 4 insertions, 4 deletions
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 b394c008..5f499348 100644
--- 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 b394c008..5f499348 100644
--- 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 b394c008..5f499348 100644
--- 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 b394c008..5f499348 100644
--- 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