Browse Source

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
(cherry picked from commit 6167279363)
changes/49/713549/1
Harald Jensås 1 year ago
parent
commit
78de0c32c5
3 changed files with 22 additions and 0 deletions
  1. +6
    -0
      network/ports/net_vip_map_external.j2.yaml
  2. +6
    -0
      network/ports/net_vip_map_external_v6.j2.yaml
  3. +10
    -0
      releasenotes/notes/add-ControlPlaneSubnetCidr-to-net_vip_map_external-c2c83431feaf7f35.yaml

+ 6
- 0
network/ports/net_vip_map_external.j2.yaml View File

@ -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: ''


+ 6
- 0
network/ports/net_vip_map_external_v6.j2.yaml View File

@ -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: ''


+ 10
- 0
releasenotes/notes/add-ControlPlaneSubnetCidr-to-net_vip_map_external-c2c83431feaf7f35.yaml View File

@ -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 <https://bugs.launchpad.net/tripleo/+bug/1864912>`_)

Loading…
Cancel
Save