From: Sofer Athlan-Guyot <sathlang@redhat.com>
Date: Mon, 7 Aug 2017 14:04:08 +0000 (+0200)
Subject: Keep dynamic network creation backward compatible.
X-Git-Tag: opnfv-6.0.0~282^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a8a1d5b30c12a3cf8f0268216e97b9d2f7568086;p=apex-tripleo-heat-templates.git

Keep dynamic network creation backward compatible.

We had an history mapping for InternalApi to InternalNetwork.  If we
remove it then heat will want to destroy InternalNetwork and create
InternalApi which cannot work during upgrade.

This adds compat name parameters to network_data.yaml.

Closes-Bug: #1709105

Change-Id: I8ce6419a5e13a13ee6e991db5ca2196763f52d7a
---

diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml
index c790d370..48c509df 100644
--- a/network/networks.j2.yaml
+++ b/network/networks.j2.yaml
@@ -3,9 +3,9 @@ heat_template_version: pike
 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 %}
 
@@ -19,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 947769ae..6ad37dfe 100644
--- a/network_data.yaml
+++ b/network_data.yaml
@@ -17,6 +17,8 @@
 # allocation_pools: IP range list e.g. [{'start':'10.0.0.4', 'end':'10.0.0.250}]
 # gateway_ip: gateway for the network (optional, may use parameter defaults)
 # NOTE: IP-related values set parameter defaults in templates, may be overridden.
+# compat_name: for existing stack you may need to override the default transformation
+#              for the resource's name.
 #
 # Example:
 # - name Example
@@ -39,6 +41,7 @@
   vip: true
   ip_subnet: '172.16.2.0/24'
   allocation_pools: [{'start': '172.16.2.4', 'end': '172.16.2.250'}]
+  compat_name: Internal
 - name: Storage
   vip: true
   name_lower: storage