14 files changed, 17 insertions, 17 deletions
diff --git a/network/external.yaml b/network/external.yaml
index 8dbe3e20..708d4635 100644
--- a/network/external.yaml
+++ b/network/external.yaml
@@ -66,4 +66,4 @@ outputs:
     description: Neutron external network
     value: {get_resource: ExternalNetwork}
   subnet_cidr:
-    value: {get_attr: ExternalSubnet, cidr}
+    value: {get_attr: [ExternalSubnet, cidr]}
diff --git a/network/external_v6.yaml b/network/external_v6.yaml
index 3266932a..9d1c3d00 100644
--- a/network/external_v6.yaml
+++ b/network/external_v6.yaml
@@ -73,4 +73,4 @@ outputs:
     description: Neutron external network
     value: {get_resource: ExternalNetwork}
   subnet_cidr:
-    value: {get_attr: ExternalSubnet, cidr}
+    value: {get_attr: [ExternalSubnet, cidr]}
diff --git a/network/internal_api.yaml b/network/internal_api.yaml
index 7ff0dafd..6e1885a9 100644
--- a/network/internal_api.yaml
+++ b/network/internal_api.yaml
@@ -62,4 +62,4 @@ outputs:
     description: Neutron internal network
     value: {get_resource: InternalApiNetwork}
   subnet_cidr:
-    value: {get_attr: InternalApiSubnet, cidr}
+    value: {get_attr: [InternalApiSubnet, cidr]}
diff --git a/network/internal_api_v6.yaml b/network/internal_api_v6.yaml
index 0688f138..7264b1c0 100644
--- a/network/internal_api_v6.yaml
+++ b/network/internal_api_v6.yaml
@@ -69,4 +69,4 @@ outputs:
     description: Neutron internal network
     value: {get_resource: InternalApiNetwork}
   subnet_cidr:
-    value: {get_attr: InternalApiSubnet, cidr}
+    value: {get_attr: [InternalApiSubnet, cidr]}
diff --git a/network/management.yaml b/network/management.yaml
index d9f773c1..be197e5c 100644
--- a/network/management.yaml
+++ b/network/management.yaml
@@ -67,4 +67,4 @@ outputs:
     description: Neutron management network
     value: {get_resource: ManagementNetwork}
   subnet_cidr:
-    value: {get_attr: ManagementSubnet, cidr}
+    value: {get_attr: [ManagementSubnet, cidr]}
diff --git a/network/management_v6.yaml b/network/management_v6.yaml
index bf715513..2eb8c876 100644
--- a/network/management_v6.yaml
+++ b/network/management_v6.yaml
@@ -68,4 +68,4 @@ outputs:
     description: Neutron management network
     value: {get_resource: ManagementNetwork}
   subnet_cidr:
-    value: {get_attr: ManagementSubnet, cidr}
+    value: {get_attr: [ManagementSubnet, cidr]}
diff --git a/network/network.network.j2.yaml b/network/network.network.j2.yaml
index 2c223c16..ccf437bb 100644
--- a/network/network.network.j2.yaml
+++ b/network/network.network.j2.yaml
@@ -88,5 +88,4 @@ outputs:
     description: {{network.name_lower}} network
     value: {get_resource: {{network.name}}Network}
   subnet_cidr:
-    value: {get_attr: {{network.name}}Subnet, cidr}
-
+    value: {get_attr: [{{network.name}}Subnet, cidr]}
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/storage.yaml b/network/storage.yaml
index 00316c51..9729044d 100644
--- a/network/storage.yaml
+++ b/network/storage.yaml
@@ -62,4 +62,4 @@ outputs:
     description: Neutron storage network
     value: {get_resource: StorageNetwork}
   subnet_cidr:
-    value: {get_attr: StorageSubnet, cidr}
+    value: {get_attr: [StorageSubnet, cidr]}
diff --git a/network/storage_mgmt.yaml b/network/storage_mgmt.yaml
index bc4347c2..fc005573 100644
--- a/network/storage_mgmt.yaml
+++ b/network/storage_mgmt.yaml
@@ -62,4 +62,4 @@ outputs:
     description: Neutron storage management network
     value: {get_resource: StorageMgmtNetwork}
   subnet_cidr:
-    value: {get_attr: StorageMgmtSubnet, cidr}
+    value: {get_attr: [StorageMgmtSubnet, cidr]}
diff --git a/network/storage_mgmt_v6.yaml b/network/storage_mgmt_v6.yaml
index 0d6614f9..cef87de9 100644
--- a/network/storage_mgmt_v6.yaml
+++ b/network/storage_mgmt_v6.yaml
@@ -69,4 +69,4 @@ outputs:
     description: Neutron storage management network
     value: {get_resource: StorageMgmtNetwork}
   subnet_cidr:
-    value: {get_attr: StorageMgmtSubnet, cidr}
+    value: {get_attr: [StorageMgmtSubnet, cidr]}
diff --git a/network/storage_v6.yaml b/network/storage_v6.yaml
index bf796b2b..51edd4b3 100644
--- a/network/storage_v6.yaml
+++ b/network/storage_v6.yaml
@@ -69,4 +69,4 @@ outputs:
     description: Neutron storage network
     value: {get_resource: StorageNetwork}
   subnet_cidr:
-    value: {get_attr: StorageSubnet, cidr}
+    value: {get_attr: [StorageSubnet, cidr]}
diff --git a/network/tenant.yaml b/network/tenant.yaml
index 2104f0bd..67c4abbc 100644
--- a/network/tenant.yaml
+++ b/network/tenant.yaml
@@ -62,4 +62,4 @@ outputs:
     description: Neutron tenant network
     value: {get_resource: TenantNetwork}
   subnet_cidr:
-    value: {get_attr: TenantSubnet, cidr}
+    value: {get_attr: [TenantSubnet, cidr]}
diff --git a/network/tenant_v6.yaml b/network/tenant_v6.yaml
index 9993eec9..9f139cb1 100644
--- a/network/tenant_v6.yaml
+++ b/network/tenant_v6.yaml
@@ -69,4 +69,4 @@ outputs:
     description: Neutron tenant network
     value: {get_resource: TenantNetwork}
   subnet_cidr:
-    value: {get_attr: TenantSubnet, cidr}
+    value: {get_attr: [TenantSubnet, cidr]}