From 6167279363fe8e69115d707ae77d4a05006e9e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Wed, 26 Feb 2020 19:58:19 +0100 Subject: [PATCH] ControlPlaneSubnetCidr in net_vip_map_external network/ports/net_vip_map_external.j2.yaml needs the ControlPlaneSubnetCidr parameter, since the resource in overcloud.yaml is passing the property. Change-Id: Ide91bd5956bcbbec36d865865c32cc6430d59a49 Closes-Bug: #1864912 --- network/ports/net_vip_map_external.j2.yaml | 6 ++++++ network/ports/net_vip_map_external_v6.j2.yaml | 6 ++++++ ...tCidr-to-net_vip_map_external-c2c83431feaf7f35.yaml | 10 ++++++++++ 3 files changed, 22 insertions(+) create mode 100644 releasenotes/notes/add-ControlPlaneSubnetCidr-to-net_vip_map_external-c2c83431feaf7f35.yaml diff --git a/network/ports/net_vip_map_external.j2.yaml b/network/ports/net_vip_map_external.j2.yaml index dfa756b460..2ee0f6de39 100644 --- a/network/ports/net_vip_map_external.j2.yaml +++ b/network/ports/net_vip_map_external.j2.yaml @@ -14,6 +14,12 @@ parameters: ControlPlaneIp: default: '' type: string + ControlPlaneSubnetCidr: # Here for compatibility with ctlplane_vip.yaml + default: '' + description: > + The subnet CIDR of the control plane network. (The parameter is + automatically resolved from the ctlplane subnet's cidr attribute.) + type: string {%- for network in networks if network.vip|default(false) and network.enabled|default(true) %} {{network.name}}Ip: default: '' diff --git a/network/ports/net_vip_map_external_v6.j2.yaml b/network/ports/net_vip_map_external_v6.j2.yaml index dfa756b460..2ee0f6de39 100644 --- a/network/ports/net_vip_map_external_v6.j2.yaml +++ b/network/ports/net_vip_map_external_v6.j2.yaml @@ -14,6 +14,12 @@ parameters: ControlPlaneIp: default: '' type: string + ControlPlaneSubnetCidr: # Here for compatibility with ctlplane_vip.yaml + default: '' + description: > + The subnet CIDR of the control plane network. (The parameter is + automatically resolved from the ctlplane subnet's cidr attribute.) + type: string {%- for network in networks if network.vip|default(false) and network.enabled|default(true) %} {{network.name}}Ip: default: '' diff --git a/releasenotes/notes/add-ControlPlaneSubnetCidr-to-net_vip_map_external-c2c83431feaf7f35.yaml b/releasenotes/notes/add-ControlPlaneSubnetCidr-to-net_vip_map_external-c2c83431feaf7f35.yaml new file mode 100644 index 0000000000..39e033ed89 --- /dev/null +++ b/releasenotes/notes/add-ControlPlaneSubnetCidr-to-net_vip_map_external-c2c83431feaf7f35.yaml @@ -0,0 +1,10 @@ +--- +fixes: + - | + The parameter ``ControlPlaneSubnetCidr`` was missing in the + ``network/ports/net_vip_map_external.j2.yaml`` and + ``network/ports/net_vip_map_external_v6.j2.yaml`` template files. This + caused deployment failure since the ``VipMap`` resource pass this + property. (See Bug: + `#1864912 `_) +