openstack/tripleo-heat-templates
Code Issues Proposed changes

Allow ctlplane network or ID, and default to "ctlplane"

Browse Source 
Currently you always have to pass the ctlplane ID because we're still
using the deprecated network_id property for the neutron port resource.

Since Juno, heat has supported a "network" property, which is used
elsewhere, e.g the nested port stacks, so switch to using it in the
overcloud-without-mergepy template, and flip the default to a more
useful "ctlplane" vs an empty string.

This means the stack create should just work on commonly documented
deployments without requiring any parameter.

Change-Id: Ifcea36d26b795c5e8b80accd8112e23b254127be
This commit is contained in:
Steven Hardy
2015-10-07 17:34:25 +01:00
parent 8585f8d3fe
commit 0d191cb5d6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
overcloud-without-mergepy.yaml
View File

@@ -120,9 +120,9 @@ parameters:
type: string type: string
default: "datacentre:br-ex" default: "datacentre:br-ex"
NeutronControlPlaneID: NeutronControlPlaneID:
default: '' default: 'ctlplane'
type: string type: string
description: Neutron ID for ctlplane network. description: Neutron ID or name for ctlplane network.
NeutronEnableTunnelling: NeutronEnableTunnelling:
type: string type: string
default: "True" default: "True"
@@ -1107,7 +1107,7 @@ resources:
depends_on: Networks depends_on: Networks
properties: properties:
name: control_virtual_ip name: control_virtual_ip
network_id: {get_param: NeutronControlPlaneID} network: {get_param: NeutronControlPlaneID}
fixed_ips: {get_param: ControlFixedIPs} fixed_ips: {get_param: ControlFixedIPs}
replacement_policy: AUTO replacement_policy: AUTO