Merge "Fixes heat resource name for Internal API Network" into stable/pike

1 files changed, 2 insertions, 4 deletions

diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml
index 48c509df..1a170045 100644
--- a/network/networks.j2.yaml
+++ b/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 %}