Fix cidr get_attr in custom networks

We were missing the square brackets around the list of arguments
for get_attr when building the networks cidr output.

This passed CI because Heat does not fail validation and Ceph (which
is consuming the cidr output) is tested with a single network (ctlplane)
which does not build the output using the same templates.

Change-Id: I40bba0784a30295cb0d4eda1fbff20ebac85db99
Closes-Bug: #1709464

diff --git a/network/external.yaml b/network/external.yaml
index 8dbe3e2..708d463 100644 (file)
--- 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 3266932..9d1c3d0 100644 (file)
--- 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 7ff0daf..6e1885a 100644 (file)
--- 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 0688f13..7264b1c 100644 (file)
--- 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 d9f773c..be197e5 100644 (file)
--- 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 bf71551..2eb8c87 100644 (file)
--- 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 2c223c1..ccf437b 100644 (file)
--- 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/storage.yaml b/network/storage.yaml
index 00316c5..9729044 100644 (file)
--- 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 bc4347c..fc00557 100644 (file)
--- 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 0d6614f..cef87de 100644 (file)
--- 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 bf796b2..51edd4b 100644 (file)
--- 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 2104f0b..67c4abb 100644 (file)
--- 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 9993eec..9f139cb 100644 (file)
--- 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]}