diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-01-23 21:34:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-01-23 21:34:52 +0000 |
| commit | 8ad2409ddb7ffe3e2d0d7fa3a25bdda791cc6978 (patch) | |
| tree | 48a0bbab7371bfd55c3003e4daa937198c2f887a | |
| parent | 01fe17fe1ba0f5d43d14890dc3b7fc0150f67ac8 (diff) | |
| parent | 0e961035a036a00c73768aecb88b9ce7a1acc9a7 (diff) | |
Merge "Expose bridge_mappings in the overcloud."
| -rw-r--r-- | overcloud-source.yaml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index ba05e280..1128b795 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -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: |