Merge "Fix TenantInterfaceDefaultRoute in net-env-v6" into stable/train
This commit is contained in:
commit
033aae9d4b
|
@ -37,16 +37,20 @@ parameter_defaults:
|
||||||
# Leave room if the external network is also used for floating IPs
|
# Leave room if the external network is also used for floating IPs
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{{network.name}}AllocationPools: {{network.ipv6_allocation_pools}}
|
{{network.name}}AllocationPools: {{network.ipv6_allocation_pools}}
|
||||||
|
{%- if network.gateway_ipv6|default(false) %}
|
||||||
|
# Gateway router for routable networks
|
||||||
|
{{network.name}}InterfaceDefaultRoute: '{{network.gateway_ipv6}}'
|
||||||
|
{%- endif %}
|
||||||
{%- else %}
|
{%- else %}
|
||||||
# Tenant tunneling network is IPv4 until IPv6 is fully supported
|
# Tenant tunneling network is IPv4 until IPv6 is fully supported
|
||||||
# Customize the IP subnets to match the local environment
|
# Customize the IP subnets to match the local environment
|
||||||
{{network.name}}NetCidr: '{{network.ip_subnet}}'
|
{{network.name}}NetCidr: '{{network.ip_subnet}}'
|
||||||
# Customize the IP range to use for static IPs and VIPs
|
# Customize the IP range to use for static IPs and VIPs
|
||||||
{{network.name}}AllocationPools: {{network.allocation_pools}}
|
{{network.name}}AllocationPools: {{network.allocation_pools}}
|
||||||
{%- endif %}
|
{%- if network.gateway_ip|default(false) %}
|
||||||
{%- if network.gateway_ipv6|default(false) %}
|
|
||||||
# Gateway router for routable networks
|
# Gateway router for routable networks
|
||||||
{{network.name}}InterfaceDefaultRoute: '{{network.gateway_ipv6}}'
|
{{network.name}}InterfaceDefaultRoute: '{{network.gateway_ip}}'
|
||||||
|
{%- endif %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if network.vlan is defined %}
|
{%- if network.vlan is defined %}
|
||||||
# Customize the VLAN ID to match the local environment
|
# Customize the VLAN ID to match the local environment
|
||||||
|
|
Loading…
Reference in New Issue