diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-07-08 19:28:32 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-07-08 19:28:32 +0000 |
commit | 6ebaadb30c3cabaae232f42306903f28627a784c (patch) | |
tree | bafaed8edbf84845e01653b9cc3c01d6c9401b67 /overcloud-without-mergepy.yaml | |
parent | 82f04ec310fe9d4f99e46077bb1c6e439187c7ed (diff) | |
parent | e3cd6284fb62a04e0dcb7a144433cf1e27af7fd7 (diff) |
Merge "Add NeutronExternalNetworkBridge parameter"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 14e2ac24..aa8e9391 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -76,6 +76,10 @@ parameters: type: string constraints: - custom_constraint: nova.keypair + 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 @@ -691,6 +695,7 @@ resources: NeutronPublicInterfaceIP: {get_param: NeutronPublicInterfaceIP} NeutronFlatNetworks: {get_param: NeutronFlatNetworks} NeutronBridgeMappings: {get_param: NeutronBridgeMappings} + NeutronExternalNetworkBridge: {get_param: NeutronExternalNetworkBridge} NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling} NeutronNetworkVLANRanges: {get_param: NeutronNetworkVLANRanges} NeutronPublicInterface: {get_param: NeutronPublicInterface} |