openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Permit specifying VLAN mappings to overclouds."

This commit is contained in:
Jenkins 2014-08-26 10:57:50 +00:00 committed by Gerrit Code Review
parent 006fe1febc 0b306f0037
commit 59e97e4ae0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
overcloud-source.yaml
View File

@ -115,6 +115,13 @@ parameters:
scripts or be sure to keep 'datacentre' as a mapping network name. scripts or be sure to keep 'datacentre' as a mapping network name.
type: string type: string
default: "datacentre:br-ex" 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: NeutronPassword:
default: unset default: unset
description: The password for the neutron service account, used by neutron agents. description: The password for the neutron service account, used by neutron agents.
@ -364,7 +371,8 @@ resources:
NeutronEnableTunnelling: "True" NeutronEnableTunnelling: "True"
NeutronFlatNetworks: NeutronFlatNetworks:
get_param: NeutronFlatNetworks get_param: NeutronFlatNetworks
NeutronNetworkVLANRanges: "" NeutronNetworkVLANRanges:
get_param: NeutronNetworkVLANRanges
NeutronPhysicalBridge: NeutronPhysicalBridge:
get_param: HypervisorNeutronPhysicalBridge get_param: HypervisorNeutronPhysicalBridge
NeutronPublicInterface: NeutronPublicInterface:
@ -524,6 +532,7 @@ resources:
enable_tunneling: 'True' enable_tunneling: 'True'
local_ip: local_ip:
get_input: controller_host get_input: controller_host
network_vlan_ranges: {get_param: NeutronNetworkVLANRanges}
bridge_mappings: {get_param: NeutronBridgeMappings} bridge_mappings: {get_param: NeutronBridgeMappings}
public_interface: public_interface:
get_param: NeutronPublicInterface get_param: NeutronPublicInterface