aboutsummaryrefslogtreecommitdiffstats
path: root/environments/net-bond-with-vlans-no-external.yaml
diff options
context:
space:
mode:
authorIhar Hrachyshka <ihrachys@redhat.com>2016-12-06 22:24:30 +0000
committerIhar Hrachyshka <ihrachys@redhat.com>2016-12-12 11:26:14 +0000
commit21d2afd4bf9f57fd0fb3709d87acb452f13912df (patch)
tree3ab09f046c67ddd609ad7e7865e98f8d6c619060 /environments/net-bond-with-vlans-no-external.yaml
parent94a42fb5b7d59d6383e4d9186216195aa742a836 (diff)
neutron: don't set external_network_bridge option by default
It's deprecated, to be removed in Ocata, and it's discouraged to set it to anything but the default value ('') that means that routers are not plugged directly into br-ex, but allows l2 agent to do the wiring. There are known issues with setting it to br-ex (like wrong port statuses): If533cf7c4c379be78f5a15073accaff7f65973ab The only caveat to setting it to the default ('') value is that in that case l2 agent should be configured with bridge mapping for physical networks. Since we already configure bridge_mappings for the agent, we should be safe to unset the option. Now that it's the default, there is no reason to override it in example environments. This patch also changes the description for the parameter to make it more clear that users are not expected to set it unless they know what they are doing. Also, moved the parameter into deprecated section to make it even more clear it's not something to touch in new deployments. Change-Id: Iade7fbaf92c8c601227f4456a15ea3f13a907ee2 Related-Bug: #1563070
Diffstat (limited to 'environments/net-bond-with-vlans-no-external.yaml')
-rw-r--r--environments/net-bond-with-vlans-no-external.yaml4
1 files changed, 0 insertions, 4 deletions
diff --git a/environments/net-bond-with-vlans-no-external.yaml b/environments/net-bond-with-vlans-no-external.yaml
index 75959a0..cc27d4f 100644
--- a/environments/net-bond-with-vlans-no-external.yaml
+++ b/environments/net-bond-with-vlans-no-external.yaml
@@ -20,7 +20,3 @@ resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller-no-external.yaml
OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/swift-storage.yaml
OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/ceph-storage.yaml
-
-# NOTE: with no external interface we should be able to use the
-# default Neutron l3_agent.ini setting for the external bridge (br-ex)
-# i.e. No need to set: NeutronExternalNetworkBridge: "''"