Revert "Fixes heat resource name for Internal API Network"

This reverts commit 520be6bb40.

This introduced a bug:
https://bugzilla.redhat.com/show_bug.cgi?id=1501515

where during upgrade, the previous heat resource would for the
InternalApi network would have the incorrect name "Internal" and the
upgrade would try to delete the resource in order to create
"InternalApi".  This needs to be reverted and a proper fix will be
submitted that accounts for this upgrade scenario.

Related-Bug: #1718764

Change-Id: Id906fac421db317ce48d5cecfcd43397a0f4ab3d
changes/58/511558/2
Tim Rozet 5 years ago
parent 520be6bb40
commit a8e7a20875
  1. 6
      network/networks.j2.yaml
  2. 1
      network_data.yaml
  3. 6
      releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml

@ -4,7 +4,8 @@ description: Create networks to split out Overcloud traffic
resources:
{%- for network in networks %}
{{network.name}}Network:
{%- set network_name = network.compat_name|default(network.name) %}
{{network_name}}Network:
type: OS::TripleO::Network::{{network.name}}
{%- endfor %}
@ -18,8 +19,9 @@ 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 %}

@ -58,6 +58,7 @@
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

@ -1,6 +0,0 @@
---
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