Browse Source

Fixes heat resource name for Internal API Network

With the dynamic Jinja2 rendering for networks, the heat resource for
Internal API network was accidentally being renamed to:
OS::TripleO::Network::Internal

when it should be the same as previous versions:
OS::TripleO::Network::InternalApi

This patch removes the 'compat_name' which was overriding the network
name for rendering the resource. This patch also removes the
compat_name functionality from the network/networks.j2.yaml file
since it is no longer needed.

Closes-Bug: 1718764

Change-Id: If756cddd91933edb303cc056515d98b941a3eb14
Signed-off-by: Tim Rozet <trozet@redhat.com>
changes/45/506345/3
Tim Rozet 4 years ago
committed by Dan Sneddon
parent
commit
97244b942d
  1. 6
      network/networks.j2.yaml
  2. 1
      network_data.yaml
  3. 6
      releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml

6
network/networks.j2.yaml

@ -4,8 +4,7 @@ description: Create networks to split out Overcloud traffic
resources:
{%- for network in networks %}
{%- set network_name = network.compat_name|default(network.name) %}
{{network_name}}Network:
{{network.name}}Network:
type: OS::TripleO::Network::{{network.name}}
{%- endfor %}
@ -19,9 +18,8 @@ outputs:
# NOTE(gfidente): we need to replace the null value with a
# string to work around https://bugs.launchpad.net/heat/+bug/1700025
{%- for network in networks %}
{%- set network_name = network.compat_name|default(network.name) %}
{{network.name_lower}}:
yaql:
data: {get_attr: [{{network_name}}Network, subnet_cidr]}
data: {get_attr: [{{network.name}}Network, subnet_cidr]}
expression: str($.data).replace('null', 'disabled')
{%- endfor %}

1
network_data.yaml

@ -58,7 +58,6 @@
allocation_pools: [{'start': '172.16.2.4', 'end': '172.16.2.250'}]
ipv6_subnet: 'fd00:fd00:fd00:2000::/64'
ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}]
compat_name: Internal
- name: Storage
vip: true
name_lower: storage

6
releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes heat resource OS::TripleO::Network::Internal to be renamed back to
OS::TripleO::Network::InternalApi for backwards compatibility with
previous versions.
Loading…
Cancel
Save