openstack/bifrost
Code Issues Proposed changes

Make booleans in templates explicit

Browse Source 
We had several places in templates where booleans weren't
handled correctly - if the boolean was defined, the template
conditional would be true regardless of its value. Fix these
conditionals so they have the correct result when variables
are defined but false.

Change-Id: I2c8e0b8ac72b5a132b0d3e1f4f0e399454397873
This commit is contained in:
stephane 2016-05-25 10:55:43 -07:00
parent d10546dd4b
commit 10f3ba5d52
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/bifrost-deploy-nodes-dynamic/templates/dhcp-host.j2
View File

@ -1,5 +1,5 @@
# This file is managed by bifrost
{% if inventory_dhcp_static_ip | bool %}
{% if inventory_dhcp_static_ip | bool == true %}
{{ nics[0]['mac'] }},{{provisioning_ipv4_address}},{{name}},12h
{% else %}
{{ nics[0]['mac'] }},{{name}},12h

10
playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2
View File

@ -17,7 +17,7 @@ port=53
# specified interfaces (and the loopback) give the name of the
# interface (eg eth0) here.
# Repeat the line for more than one interface.
{% if testing %}
{% if testing | bool == true %}
interface=virbr0
{% else %}
interface={{ network_interface }}
@ -42,7 +42,7 @@ conf-dir=/etc/dnsmasq.d
# or if you want it to read another file, as well as /etc/hosts, use
# this.
#addn-hosts=/etc/banner_add_hosts
{% if inventory_dhcp %}
{% if inventory_dhcp | bool == true %}
addn-hosts=/etc/dnsmasq.d/bifrost.hosts.d
dhcp-hostsfile=/etc/dnsmasq.d/bifrost.dhcp-hosts.d
dhcp-ignore=tag:!known
@ -65,7 +65,7 @@ domain={{ domain }}
# a lease time. If you have more than one network, you will need to
# repeat this for each network on which you want to supply DHCP
# service.
{% if testing %}
{% if testing | bool == true %}
dhcp-range=192.168.122.2,192.168.122.254,12h
{% elif inventory_dhcp %}
dhcp-range={{dhcp_pool_start}},{{dhcp_pool_end}},static,{{dhcp_static_mask}},{{dhcp_lease_time}}
@ -95,13 +95,13 @@ dhcp-boot=tag:gpxe,/ipxe.pxe
dhcp-match=set:ipxe,175 # iPXE sends a 175 option.
dhcp-boot=tag:!ipxe,/undionly.kpxe
{% if testing %}
{% if testing | bool == true %}
dhcp-boot=http://192.168.122.1:{{ file_url_port }}/boot.ipxe
{% else %}
dhcp-boot=http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{ file_url_port }}/boot.ipxe
{% endif %}
{% if testing %}
{% if testing | bool == true %}
log-queries
log-dhcp
{% endif %}