From 68c50520b3625376882ee63d68a6407f9f7a9004 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Fri, 8 Feb 2019 11:05:06 +0000
Subject: [PATCH] Fix generation of globals.yml

kolla_inspector_* variables are identified by Jinja as empty strings
rather than none, so globals.yml is generated with a syntax error:

ironic_dnsmasq_dhcp_range: ,
                           ^ here

Change-Id: Ic36faaff37333f5af03a130dd97d31b26b7ff97f
---
 ansible/roles/kolla-ansible/templates/globals.yml.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2
index 03933b8a0..edeab143f 100644
--- a/ansible/roles/kolla-ansible/templates/globals.yml.j2
+++ b/ansible/roles/kolla-ansible/templates/globals.yml.j2
@@ -288,10 +288,10 @@ enable_{{ feature_flag }}: {{ hostvars[inventory_hostname]['kolla_enable_' ~ fea
 #############################
 # Ironic options
 #############################
-{% if kolla_inspector_dhcp_pool_start is not none and kolla_inspector_dhcp_pool_end is not none %}
+{% if kolla_inspector_dhcp_pool_start and kolla_inspector_dhcp_pool_end %}
 ironic_dnsmasq_dhcp_range: {{ kolla_inspector_dhcp_pool_start }},{{ kolla_inspector_dhcp_pool_end }}
 {% endif %}
-{% if kolla_inspector_default_gateway is not none %}
+{% if kolla_inspector_default_gateway %}
 ironic_dnsmasq_default_gateway: {{ kolla_inspector_default_gateway }}
 {% endif %}