openstack
/
tripleo-quickstart
Code Issues Proposed changes

Fix unqualified Ansible boolean variables 

When using boolean variables in conditional tests, those variables should be
filtered as '|bool'. Otherwise, they are being evaluated as a string and return
True in any case.

Change-Id: I591d49cfd242d9b404de9fe616c08008fa626764
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud 2017-04-05 16:45:15 +02:00
parent ecb109d647
commit ccf0df9f91
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/convert-image/templates/convert_image.sh.j2
View File

@ -13,7 +13,7 @@ else
exit 1 exit 1
fi fi
{% if not undercloud_setup %} {% if not undercloud_setup|bool %}
yum update -y yum update -y
@ -50,7 +50,7 @@ chmod 600 /swapfile
# Enable it on start # Enable it on start
echo "/swapfile swap swap defaults 0 0" >> /etc/fstab echo "/swapfile swap swap defaults 0 0" >> /etc/fstab
{% if not selinux_enforcing %} {% if not selinux_enforcing|bool %}
sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config

2
roles/libvirt/setup/overcloud/templates/baremetalvm.xml.j2
View File

@ -36,7 +36,7 @@
<serial type='pty'/> <serial type='pty'/>
<console type='pty'/> <console type='pty'/>
{% if enable_vnc_console %} {% if enable_vnc_console|bool %}
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/> <graphics type='vnc' port='-1' autoport='yes'/>
<video> <video>

4
roles/libvirt/setup/undercloud/templates/undercloudvm.xml.j2
View File

@ -6,7 +6,7 @@
<type arch='{{ libvirt_arch }}'>hvm</type> <type arch='{{ libvirt_arch }}'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
<bootmenu enable='no'/> <bootmenu enable='no'/>
{% if overcloud_as_undercloud %} {% if overcloud_as_undercloud|bool %}
<kernel>{{ working_dir }}/overcloud-full.vmlinuz</kernel> <kernel>{{ working_dir }}/overcloud-full.vmlinuz</kernel>
<initrd>{{ working_dir }}/overcloud-full.initrd</initrd> <initrd>{{ working_dir }}/overcloud-full.initrd</initrd>
<cmdline>console=ttyS0 root=/dev/vda</cmdline> <cmdline>console=ttyS0 root=/dev/vda</cmdline>
@ -46,7 +46,7 @@
<serial type='pty'/> <serial type='pty'/>
<console type='pty'/> <console type='pty'/>
{% if enable_vnc_console %} {% if enable_vnc_console|bool %}
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/> <graphics type='vnc' port='-1' autoport='yes'/>
<video> <video>