openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix network_cidrs when ManageNetworks: false" into stable/ussuri

This commit is contained in:
Zuul 2021-06-01 23:45:18 +00:00 committed by Gerrit Code Review
parent 531db9be0d e5d1894433
commit 9a5e865209
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
network/network.j2
View File

@ -265,25 +265,13 @@ outputs:
network_cidrs:
description: List of {{network.name}} network's subnets in CIDR notation.
value:
list_concat:
if:
- manage_networks
- - - {get_attr: [{{network.name}}Subnet, cidr]}
-
if:
- manage_networks
- - {get_attr: [{{network.name}}Subnet, cidr]}
{%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
- {get_attr: [{{network.name}}Subnet_{{subnet}}, cidr]}
- {get_attr: [{{network.name}}Subnet_{{subnet}}, cidr]}
{%- endfor %}
- -
{%- if network.ipv6 or ipv6_override %}
- {{network.ipv6_subnet|default(network.ip_subnet|default(""))}}
{%- else %}
- "{{network.ip_subnet|default("")}}"
{%- endif %}
-
- - {get_param: {{network.name}}NetCidr}
{%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
{%- if network.ipv6 or ipv6_override %}
- "{{network.subnets[subnet]['ipv6_subnet']|default(network.subnets[subnet]['ip_subnet']|default(""))}}"
{%- else %}
- "{{network.subnets[subnet]['ip_subnet']|default("")}}"
{%- endif %}
- {get_param: {{network.name}}SubnetCidr_{{subnet}}}
{%- endfor %}