Merge "Fix TenantInterfaceDefaultRoute in net-env-v6" into stable/train

This commit is contained in:
Zuul 2020-03-15 00:51:04 +00:00 committed by Gerrit Code Review
commit 033aae9d4b
1 changed files with 7 additions and 3 deletions

View File

@ -37,16 +37,20 @@ parameter_defaults:
# Leave room if the external network is also used for floating IPs
{%- endif %}
{{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 %}
# Tenant tunneling network is IPv4 until IPv6 is fully supported
# Customize the IP subnets to match the local environment
{{network.name}}NetCidr: '{{network.ip_subnet}}'
# Customize the IP range to use for static IPs and VIPs
{{network.name}}AllocationPools: {{network.allocation_pools}}
{%- endif %}
{%- if network.gateway_ipv6|default(false) %}
{%- if network.gateway_ip|default(false) %}
# Gateway router for routable networks
{{network.name}}InterfaceDefaultRoute: '{{network.gateway_ipv6}}'
{{network.name}}InterfaceDefaultRoute: '{{network.gateway_ip}}'
{%- endif %}
{%- endif %}
{%- if network.vlan is defined %}
# Customize the VLAN ID to match the local environment