diff --git a/network/network.j2 b/network/network.j2 index ffc2a95db2..9ce02906a0 100644 --- a/network/network.j2 +++ b/network/network.j2 @@ -171,8 +171,8 @@ resources: # NOTE(hjensas): Depends-On here to ensure we always create the base subnet # first. We can only set the segment for existing subnet if there is only # one segment and only one existing subnet on the network. -{%- if subnet.external_resource_segment_id|default('') %} - external_id: {{ subnet.external_resource_segment_id }} +{%- if network.subnets[subnet].external_resource_segment_id|default('') %} + external_id: {{ network.subnets[subnet].external_resource_segment_id }} {%- else %} depends_on: {{network.name}}Subnet {%- endif %} @@ -184,8 +184,8 @@ resources: {{network.name}}Subnet_{{subnet}}: type: OS::Neutron::Subnet -{%- if subnet.external_resource_subnet_id|default('') %} - external_id: {{ subnet.external_resource_subnet_id }} +{%- if network.subnets[subnet].external_resource_subnet_id|default('') %} + external_id: {{ network.subnets[subnet].external_resource_subnet_id }} {%- endif %} properties: {%- if ":" in network.ip_subnet or network.ipv6 or ipv6_override %}