From 98a4b44822a9f31667fd2b4411ebb0b9e9e42532 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 12 Jan 2018 15:47:17 +0000 Subject: [PATCH] Use bool filter with enable_ironic_pxe_uefi Without the bool filter, "no" is interpreted as True. Change-Id: I8812b72102199f533730cbde85b8ffe61cf81218 Closes-Bug: #1742969 --- ansible/roles/ironic/tasks/config.yml | 4 ++-- ansible/roles/ironic/tasks/precheck.yml | 4 ++-- ansible/roles/ironic/templates/ironic-pxe.json.j2 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml index e93a9f7774..3dd12c96ad 100644 --- a/ansible/roles/ironic/tasks/config.yml +++ b/ansible/roles/ironic/tasks/config.yml @@ -72,7 +72,7 @@ # Only required when Ironic inspector is in use. - groups['ironic-inspector'] | length > 0 - inventory_hostname in groups['ironic-pxe'] - - not enable_ironic_pxe_uefi + - not enable_ironic_pxe_uefi | bool - name: Copying ironic_pxe_uefi.cfg default template: @@ -97,7 +97,7 @@ # Only required when Ironic inspector is in use. - groups['ironic-inspector'] | length > 0 - inventory_hostname in groups['ironic-pxe'] - - not enable_ironic_pxe_uefi + - not enable_ironic_pxe_uefi | bool - name: Check if policies shall be overwritten local_action: stat path="{{ node_custom_config }}/ironic/policy.json" diff --git a/ansible/roles/ironic/tasks/precheck.yml b/ansible/roles/ironic/tasks/precheck.yml index 0dc5a1a03f..1ad15ae229 100644 --- a/ansible/roles/ironic/tasks/precheck.yml +++ b/ansible/roles/ironic/tasks/precheck.yml @@ -28,7 +28,7 @@ - container_facts['ironic_inspector'] is not defined - inventory_hostname in groups['ironic-inspector'] -- name: Checking ironic-agent files exist for Ironic +- name: Checking ironic-agent files exist for Ironic Inspector local_action: stat path="{{ node_custom_config }}/ironic/{{ item }}" run_once: True register: result @@ -37,7 +37,7 @@ # Only required when Ironic inspector is in use. - groups['ironic-inspector'] | length > 0 - inventory_hostname in groups['ironic-pxe'] - - not enable_ironic_pxe_uefi + - not enable_ironic_pxe_uefi | bool with_items: - "ironic-agent.kernel" - "ironic-agent.initramfs" diff --git a/ansible/roles/ironic/templates/ironic-pxe.json.j2 b/ansible/roles/ironic/templates/ironic-pxe.json.j2 index 3a06abb7f0..a7bd604bfa 100644 --- a/ansible/roles/ironic/templates/ironic-pxe.json.j2 +++ b/ansible/roles/ironic/templates/ironic-pxe.json.j2 @@ -5,7 +5,7 @@ "command": "/usr/sbin/in.tftpd --verbose --foreground --user root --address 0.0.0.0:69 --map-file /map-file /tftpboot", "config_files": [ {% if groups['ironic-inspector'] | length > 0 %} -{% if not enable_ironic_pxe_uefi %} +{% if not enable_ironic_pxe_uefi | bool %} { "source": "{{ container_config_directory }}/ironic-agent.kernel", "dest": "/tftpboot/ironic-agent.kernel",