aboutsummaryrefslogtreecommitdiffstats
path: root/controller.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-08 19:28:32 +0000
committerGerrit Code Review <review@openstack.org>2015-07-08 19:28:32 +0000
commit6ebaadb30c3cabaae232f42306903f28627a784c (patch)
treebafaed8edbf84845e01653b9cc3c01d6c9401b67 /controller.yaml
parent82f04ec310fe9d4f99e46077bb1c6e439187c7ed (diff)
parente3cd6284fb62a04e0dcb7a144433cf1e27af7fd7 (diff)
Merge "Add NeutronExternalNetworkBridge parameter"
Diffstat (limited to 'controller.yaml')
-rw-r--r--controller.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/controller.yaml b/controller.yaml
index 5596591f..bb70b28f 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -257,6 +257,10 @@ parameters:
type: string
hidden: true
default: '' # Has to be here because of the ignored empty value bug
+ NeutronExternalNetworkBridge:
+ description: Name of bridge used for external network traffic.
+ type: string
+ default: 'br-ex'
NeutronBridgeMappings:
description: >
The OVS logical->physical bridge mappings to use. See the Neutron