From d69ec8a5c37216e33d2ce1a0f2a61fd6fc618180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 12 Mar 2020 21:22:46 +0100 Subject: [PATCH] Fix TenantInterfaceDefaultRoute in net-env-v6 The TenantInterfaceDefaultRoute in network-environment-v6.j2.yaml should use the ipv4 gateway address. Closes-Bug: #1867207 Change-Id: If011da577adec7d95e0caf8f1c9c6cb88581cae1 (cherry picked from commit 26e4a0ab59e31757bc3683da14d8ccf5dcc90594) --- environments/network-environment-v6.j2.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/environments/network-environment-v6.j2.yaml b/environments/network-environment-v6.j2.yaml index 95e6e0fd36..a95461af2b 100644 --- a/environments/network-environment-v6.j2.yaml +++ b/environments/network-environment-v6.j2.yaml @@ -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