Merge "Fix external resource usage in additional subnets" into stable/stein

This commit is contained in:
Zuul 2019-08-15 21:43:20 +00:00 committed by Gerrit Code Review
commit 9adae5043a
1 changed files with 4 additions and 4 deletions

View File

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