From b3985983110b97948b4060ee888c27495558f809 Mon Sep 17 00:00:00 2001
From: Piotr Kopec <pkopec@redhat.com>
Date: Wed, 27 Nov 2019 11:26:10 +0100
Subject: [PATCH] Fix for Ansible playbook error, variable is undefined

This fixes the variable is undefined problem when deploying minions.

Change-Id: I2893b77bb1c7811fbdbf0426e0a09f80b2179f54
Closes-Bug: #1837644
---
 tripleo_ansible/roles/tripleo-hieradata/templates/fqdn.j2       | 2 +-
 tripleo_ansible/roles/tripleo-hieradata/templates/net_ip_map.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/fqdn.j2 b/tripleo_ansible/roles/tripleo-hieradata/templates/fqdn.j2
index 4a20c356a..46618f03b 100644
--- a/tripleo_ansible/roles/tripleo-hieradata/templates/fqdn.j2
+++ b/tripleo_ansible/roles/tripleo-hieradata/templates/fqdn.j2
@@ -1,7 +1,7 @@
 {% set fqdn = {} %}
 {% set _ = fqdn.__setitem__('fqdn_ctlplane', (inventory_hostname ~ '.ctlplane.' ~ cloud_domain)) %}
 {% set _ = fqdn.__setitem__('fqdn_canonical', (inventory_hostname ~ '.' ~ cloud_domain)) %}
-{% if role_networks %}
+{% if role_networks is defined %}
 {%   for network in enabled_networks %}
 {%     if network in role_networks %}
 {%       set _ = fqdn.__setitem__(('fqdn_' ~ networks[network]['name_lower']), (inventory_hostname ~ '.' ~ network | lower ~ '.' ~ cloud_domain)) %}
diff --git a/tripleo_ansible/roles/tripleo-hieradata/templates/net_ip_map.j2 b/tripleo_ansible/roles/tripleo-hieradata/templates/net_ip_map.j2
index edbeedcd0..41f71dc85 100644
--- a/tripleo_ansible/roles/tripleo-hieradata/templates/net_ip_map.j2
+++ b/tripleo_ansible/roles/tripleo-hieradata/templates/net_ip_map.j2
@@ -3,7 +3,7 @@
 {% set _ = net_ip_map.__setitem__('ctlplane_subnet', ctlplane_ip ~ '/' ~ ctlplane_subnet_cidr) %}
 {% set _ = net_ip_map.__setitem__('ctlplane_uri', (ctlplane_ip | ipwrap)) %}
 {% for network in enabled_networks %}
-{%   if network_cidrs and ((network ~ '_cidr') in network_cidrs) %}
+{%   if network_cidrs is defined and ((network ~ '_cidr') in network_cidrs) %}
 {%     set _ = net_ip_map.__setitem__(networks[network]['name'], (hostvars[inventory_hostname][networks[network]['name'] ~ '_ip'])) %}
 {%     set _ = net_ip_map.__setitem__((networks[network]['name'] ~ '_subnet'), (hostvars[inventory_hostname][networks[network]['name'] ~ '_ip'] ~ '/' ~ network_cidrs[network ~ '_cidr'])) %}
 {%     set _ = net_ip_map.__setitem__((networks[network]['name'] ~ '_uri'), (hostvars[inventory_hostname][networks[network]['name'] ~ '_ip'] | ipwrap)) %}