Fix condition to add per subnet routes parameter
Fix condition to add per subnet {{network.name}}Routes_{{subnet}} parameter to the network-environments file. Change-Id: I38b8b899716bfd8c50c419761963a423e45397ea (cherry picked from commit0474999379
) (cherry picked from commit61bf0ab938
) (cherry picked from commit2e679aab60
) (cherry picked from commit394e2ac6de
)
This commit is contained in:
parent
b0bd3a3665
commit
a9a6b0440a
|
@ -73,14 +73,14 @@ parameter_defaults:
|
|||
{{network.name}}SubnetCidr_{{subnet}}: {{network.subnets[subnet]['ipv6_subnet']}}
|
||||
{{network.name}}AllocationPools_{{subnet}}: {{network.subnets[subnet]['ipv6_allocation_pools']}}
|
||||
{{network.name}}InterfaceDefaultRoute_{{subnet}}: {{network.subnets[subnet]['gateway_ipv6']}}
|
||||
{%- if network.subnets[subnet][routes_ipv6] %}
|
||||
{%- if network.subnets[subnet]['routes_ipv6'] is defined %}
|
||||
{{network.name}}Routes_{{subnet}}: {{network.subnets[subnet]['routes_ipv6']|default([])}}
|
||||
{%- endif %}
|
||||
{%- else %}
|
||||
{{network.name}}SubnetCidr_{{subnet}}: {{network.subnets[subnet]['ip_subnet']}}
|
||||
{{network.name}}AllocationPools_{{subnet}}: {{network.subnets[subnet]['allocation_pools']}}
|
||||
{{network.name}}InterfaceDefaultRoute_{{subnet}}: {{network.subnets[subnet]['gateway_ip']}}
|
||||
{%- if network.subnets[subnet][routes] %}
|
||||
{%- if network.subnets[subnet]['routes'] is defined %}
|
||||
{{network.name}}Routes_{{subnet}}: {{network.subnets[subnet]['routes']|default([])}}
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
|
|
|
@ -67,14 +67,14 @@ parameter_defaults:
|
|||
{{network.name}}SubnetCidr_{{subnet}}: {{network.subnets[subnet]['ipv6_subnet']}}
|
||||
{{network.name}}AllocationPools_{{subnet}}: {{network.subnets[subnet]['ipv6_allocation_pools']}}
|
||||
{{network.name}}InterfaceDefaultRoute_{{subnet}}: {{network.subnets[subnet]['gateway_ipv6']}}
|
||||
{%- if network.subnets[subnet][routes_ipv6] %}
|
||||
{%- if network.subnets[subnet]['routes_ipv6'] is defined %}
|
||||
{{network.name}}Routes_{{subnet}}: {{network.subnets[subnet]['routes_ipv6']|default([])}}
|
||||
{%- endif %}
|
||||
{%- else %}
|
||||
{{network.name}}SubnetCidr_{{subnet}}: {{network.subnets[subnet]['ip_subnet']}}
|
||||
{{network.name}}AllocationPools_{{subnet}}: {{network.subnets[subnet]['allocation_pools']}}
|
||||
{{network.name}}InterfaceDefaultRoute_{{subnet}}: {{network.subnets[subnet]['gateway_ip']}}
|
||||
{%- if network.subnets[subnet][routes] %}
|
||||
{%- if network.subnets[subnet]['routes'] is defined %}
|
||||
{{network.name}}Routes_{{subnet}}: {{network.subnets[subnet]['routes']|default([])}}
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
|
|
Loading…
Reference in New Issue