Browse Source

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

tags/10.6.1
Zuul 1 month ago
parent
commit
9adae5043a
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      network/network.j2

+ 4
- 4
network/network.j2 View File

@@ -171,8 +171,8 @@ resources:
171 171
     # NOTE(hjensas): Depends-On here to ensure we always create the base subnet
172 172
     #   first. We can only set the segment for existing subnet if there is only
173 173
     #   one segment and only one existing subnet on the network.
174
-{%- if subnet.external_resource_segment_id|default('') %}
175
-    external_id: {{ subnet.external_resource_segment_id }}
174
+{%- if network.subnets[subnet].external_resource_segment_id|default('') %}
175
+    external_id: {{ network.subnets[subnet].external_resource_segment_id }}
176 176
 {%- else %}
177 177
     depends_on: {{network.name}}Subnet
178 178
 {%- endif %}
@@ -184,8 +184,8 @@ resources:
184 184
 
185 185
   {{network.name}}Subnet_{{subnet}}:
186 186
     type: OS::Neutron::Subnet
187
-{%- if subnet.external_resource_subnet_id|default('') %}
188
-    external_id: {{ subnet.external_resource_subnet_id }}
187
+{%- if network.subnets[subnet].external_resource_subnet_id|default('') %}
188
+    external_id: {{ network.subnets[subnet].external_resource_subnet_id }}
189 189
 {%- endif %}
190 190
     properties:
191 191
 {%- if ":" in network.ip_subnet or network.ipv6 or ipv6_override %}

Loading…
Cancel
Save