path: root/network
diff options
authorTim Rozet <trozet@redhat.com>2017-10-12 19:21:59 +0000
committerTim Rozet <trozet@redhat.com>2017-10-12 15:56:08 -0400
commita8e7a2087532658af9703dc69481958657b3868f (patch)
treeac229217188547d4defa986310e6cc2907e172df /network
parent520be6bb4056ead8e6fad08ad96e99f7da5b341e (diff)
Revert "Fixes heat resource name for Internal API Network"
This reverts commit 520be6bb4056ead8e6fad08ad96e99f7da5b341e. 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
Diffstat (limited to 'network')
1 files changed, 4 insertions, 2 deletions
diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml
index 1a17004..48c509d 100644
--- a/network/networks.j2.yaml
+++ b/network/networks.j2.yaml
@@ -4,7 +4,8 @@ description: Create networks to split out Overcloud traffic
{%- 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) %}
- data: {get_attr: [{{network.name}}Network, subnet_cidr]}
+ data: {get_attr: [{{network_name}}Network, subnet_cidr]}
expression: str($.data).replace('null', 'disabled')
{%- endfor %}