Browse Source

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
changes/86/491886/1
Giulio Fidente 5 years ago
parent
commit
7d332c92a6
  1. 2
      network/external.yaml
  2. 2
      network/external_v6.yaml
  3. 2
      network/internal_api.yaml
  4. 2
      network/internal_api_v6.yaml
  5. 2
      network/management.yaml
  6. 2
      network/management_v6.yaml
  7. 3
      network/network.network.j2.yaml
  8. 2
      network/storage.yaml
  9. 2
      network/storage_mgmt.yaml
  10. 2
      network/storage_mgmt_v6.yaml
  11. 2
      network/storage_v6.yaml
  12. 2
      network/tenant.yaml
  13. 2
      network/tenant_v6.yaml

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save