Merge "Expose bridge_mappings in the overcloud."

This commit is contained in:
Jenkins 2014-01-23 21:34:52 +00:00 committed by Gerrit Code Review
commit 8ad2409ddb
1 changed files with 7 additions and 1 deletions

View File

@ -39,6 +39,10 @@ Parameters:
Default: default
Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
Type: String
NeutronBridgeMappings:
Description: The OVS logical->physical bridge mappings to use.
Type: String
Default: ''
NeutronPassword:
Default: unset
Description: The password for the neutron service account, used by neutron agents.
@ -149,7 +153,8 @@ Resources:
NeutronNetworkType: "gre"
NeutronEnableTunnelling: "True"
NeutronNetworkVLANRanges: ""
NeutronBridgeMappings: ""
NeutronBridgeMappings:
Ref: NeutronBridgeMappings
RabbitPassword: "guest"
NovaCompute0:
Type: FileInclude
@ -284,6 +289,7 @@ Resources:
- Fn::GetAtt:
- notcompute
- networks
bridge_mappings: {Ref: NeutronBridgeMappings}
public_interface:
Ref: NeutronPublicInterface
public_interface_raw_device: