diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 2d7f6b01d9..e9b7c7a139 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. @@ -351,7 +358,8 @@ resources: NeutronEnableTunnelling: "True" NeutronFlatNetworks: get_param: NeutronFlatNetworks - NeutronNetworkVLANRanges: "" + NeutronNetworkVLANRanges: + get_param: NeutronNetworkVLANRanges NeutronPhysicalBridge: get_param: HypervisorNeutronPhysicalBridge NeutronPublicInterface: @@ -510,6 +518,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