diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-26 10:57:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-26 10:57:50 +0000 |
| commit | 59e97e4ae0f02069dbcf6f675337cc11bd0d6076 (patch) | |
| tree | e3efc69b0720b1a3733501c12935ac20960fe6bd | |
| parent | 006fe1febcc31673d659fcf907fc4949b4fc644f (diff) | |
| parent | 0b306f003728555cc16e2c389e5006a55e22e0f9 (diff) | |
Merge "Permit specifying VLAN mappings to overclouds."
| -rw-r--r-- | overcloud-source.yaml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 073a62a3..63ebb207 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -115,6 +115,13 @@ parameters: scripts or be sure to keep 'datacentre' as a mapping network name. type: string default: "datacentre:br-ex" + NeutronNetworkVLANRanges: + default: 'datacentre' + description: | + The Neutron ML2 and OpenVSwitch vlan mapping range to support. See the + Neutron documentation for permitted values. Defaults to permitting any + VLAN on the 'datacentre' physical network (See NeutronBridgeMappings). + type: string NeutronPassword: default: unset description: The password for the neutron service account, used by neutron agents. @@ -364,7 +371,8 @@ resources: NeutronEnableTunnelling: "True" NeutronFlatNetworks: get_param: NeutronFlatNetworks - NeutronNetworkVLANRanges: "" + NeutronNetworkVLANRanges: + get_param: NeutronNetworkVLANRanges NeutronPhysicalBridge: get_param: HypervisorNeutronPhysicalBridge NeutronPublicInterface: @@ -524,6 +532,7 @@ resources: enable_tunneling: 'True' local_ip: get_input: controller_host + network_vlan_ranges: {get_param: NeutronNetworkVLANRanges} bridge_mappings: {get_param: NeutronBridgeMappings} public_interface: get_param: NeutronPublicInterface |