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
This commit is contained in:
Giulio Fidente 2017-08-08 21:00:30 +02:00
parent 5bf7d6582b
commit 7d332c92a6
13 changed files with 13 additions and 14 deletions

View File

@ -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]}

View File

@ -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]}

View File

@ -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]}

View File

@ -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]}

View File

@ -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]}

View File

@ -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]}

View File

@ -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]}

View File

@ -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]}

View File

@ -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]}

View File

@ -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]}

View File

@ -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]}

View File

@ -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]}

View File

@ -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]}