Merge "Fix external resource usage in additional subnets" into stable/stein
This commit is contained in:
commit
9adae5043a
|
@ -171,8 +171,8 @@ resources:
|
||||||
# NOTE(hjensas): Depends-On here to ensure we always create the base subnet
|
# 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
|
# first. We can only set the segment for existing subnet if there is only
|
||||||
# one segment and only one existing subnet on the network.
|
# one segment and only one existing subnet on the network.
|
||||||
{%- if subnet.external_resource_segment_id|default('') %}
|
{%- if network.subnets[subnet].external_resource_segment_id|default('') %}
|
||||||
external_id: {{ subnet.external_resource_segment_id }}
|
external_id: {{ network.subnets[subnet].external_resource_segment_id }}
|
||||||
{%- else %}
|
{%- else %}
|
||||||
depends_on: {{network.name}}Subnet
|
depends_on: {{network.name}}Subnet
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
@ -184,8 +184,8 @@ resources:
|
||||||
|
|
||||||
{{network.name}}Subnet_{{subnet}}:
|
{{network.name}}Subnet_{{subnet}}:
|
||||||
type: OS::Neutron::Subnet
|
type: OS::Neutron::Subnet
|
||||||
{%- if subnet.external_resource_subnet_id|default('') %}
|
{%- if network.subnets[subnet].external_resource_subnet_id|default('') %}
|
||||||
external_id: {{ subnet.external_resource_subnet_id }}
|
external_id: {{ network.subnets[subnet].external_resource_subnet_id }}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
properties:
|
properties:
|
||||||
{%- if ":" in network.ip_subnet or network.ipv6 or ipv6_override %}
|
{%- if ":" in network.ip_subnet or network.ipv6 or ipv6_override %}
|
||||||
|
|
Loading…
Reference in New Issue