openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix TenantInterfaceDefaultRoute in net-env-v6

Browse Source 
The TenantInterfaceDefaultRoute in network-environment-v6.j2.yaml
should use the ipv4 gateway address.

Closes-Bug: #1867207
Change-Id: If011da577adec7d95e0caf8f1c9c6cb88581cae1
This commit is contained in:
Harald Jensås 2020-03-12 21:22:46 +01:00
parent 401d519921
commit 26e4a0ab59
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
environments/network-environment-v6.j2.yaml
View File

@ -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