From a9a6b0440a832165a72bcdc6cb9df3d711434cb0 Mon Sep 17 00:00:00 2001
From: Martin Schuppert <mschuppert@redhat.com>
Date: Mon, 15 Nov 2021 16:59:18 +0100
Subject: [PATCH] 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 commit 0474999379190ce1368418db92323b8f095a7045)
(cherry picked from commit 61bf0ab9380d5bb728ccec4133c6c87e32a8947c)
(cherry picked from commit 2e679aab60cf71caeaeabe262b553e03320dc825)
(cherry picked from commit 394e2ac6ded278c61de73c65eb127f7d92b43f9c)
---
 environments/network-environment-v6.j2.yaml | 4 ++--
 environments/network-environment.j2.yaml    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/environments/network-environment-v6.j2.yaml b/environments/network-environment-v6.j2.yaml
index a95461af2b..e382f22217 100644
--- a/environments/network-environment-v6.j2.yaml
+++ b/environments/network-environment-v6.j2.yaml
@@ -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 %}
diff --git a/environments/network-environment.j2.yaml b/environments/network-environment.j2.yaml
index 60a23c25d1..17cc57c0f2 100644
--- a/environments/network-environment.j2.yaml
+++ b/environments/network-environment.j2.yaml
@@ -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 %}