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
This commit is contained in:
Pierre Riteau 2019-02-08 11:05:06 +00:00
parent 288338d6b1
commit 68c50520b3
1 changed files with 2 additions and 2 deletions

View File

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