openstack
/
kayobe
Code Issues Proposed changes

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
(cherry picked from commit 68c50520b3)
This commit is contained in:
Pierre Riteau 2019-02-08 11:05:06 +00:00 committed by Mark Goddard
parent 958c0e3caf
commit bd9e86c5d2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/kolla-ansible/templates/globals.yml.j2
View File

@ -287,7 +287,7 @@ 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 %}