Merge "Fix network_cidrs when ManageNetworks: false" into stable/victoria
This commit is contained in:
commit
c8c5fc1092
|
@ -277,27 +277,15 @@ outputs:
|
||||||
network_cidrs:
|
network_cidrs:
|
||||||
description: List of {{network.name}} network's subnets in CIDR notation.
|
description: List of {{network.name}} network's subnets in CIDR notation.
|
||||||
value:
|
value:
|
||||||
list_concat:
|
if:
|
||||||
if:
|
- manage_networks
|
||||||
- manage_networks
|
- - {get_attr: [{{network.name}}Subnet, cidr]}
|
||||||
- - - {get_attr: [{{network.name}}Subnet, cidr]}
|
|
||||||
-
|
|
||||||
{%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
|
{%- 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 %}
|
{%- endfor %}
|
||||||
- -
|
- - {get_param: {{network.name}}NetCidr}
|
||||||
{%- if network.ipv6 or ipv6_override %}
|
|
||||||
- {{network.ipv6_subnet|default(network.ip_subnet|default(""))}}
|
|
||||||
{%- else %}
|
|
||||||
- "{{network.ip_subnet|default("")}}"
|
|
||||||
{%- endif %}
|
|
||||||
-
|
|
||||||
{%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
|
{%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
|
||||||
{%- if network.ipv6 or ipv6_override %}
|
- {get_param: {{network.name}}SubnetCidr_{{subnet}}}
|
||||||
- "{{network.subnets[subnet]['ipv6_subnet']|default(network.subnets[subnet]['ip_subnet']|default(""))}}"
|
|
||||||
{%- else %}
|
|
||||||
- "{{network.subnets[subnet]['ip_subnet']|default("")}}"
|
|
||||||
{%- endif %}
|
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
||||||
network_attrs:
|
network_attrs:
|
||||||
|
|
Loading…
Reference in New Issue