From 8817c546d3bce0eca9b92177c78f86f28076c7d4 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 12 Oct 2017 19:25:53 +0000 Subject: [PATCH] Revert "Fixes heat resource name for Internal API Network" This reverts commit 97244b942d29d2b5acd7a3eb07acdba0d9b99677. 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: Ied908020ed856a5573f1333b9139029d0ffc37b4 --- network/networks.j2.yaml | 6 ++++-- network_data.yaml | 1 + .../fix-internal-api-network-name-282bfda2cdb406aa.yaml | 6 ------ 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml index 1a170045b3..48c509df47 100644 --- a/network/networks.j2.yaml +++ b/network/networks.j2.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 %} diff --git a/network_data.yaml b/network_data.yaml index f73b0f8e0b..fed11576c7 100644 --- a/network_data.yaml +++ b/network_data.yaml @@ -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 diff --git a/releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml b/releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml deleted file mode 100644 index 2e7e79f109..0000000000 --- a/releasenotes/notes/fix-internal-api-network-name-282bfda2cdb406aa.yaml +++ /dev/null @@ -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.