From 347ee1cc7fb267c48bb8eb26f60c2f57427e9a77 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 26 Nov 2018 10:42:31 +0000
Subject: [PATCH] Fix skipping glance check if deploy images not defined

Somewhere along the line, the default None value for deploy_kernel and
deploy_ramdisk gets converted to a string. Allow for both possibilities.

Change-Id: Ia06bff344262f82956da1d6548bae9a30fcdffd9
TrivialFix
---
 ansible/roles/ironic-enrolment/tasks/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/ironic-enrolment/tasks/main.yml b/ansible/roles/ironic-enrolment/tasks/main.yml
index 20f3070..c8d3103 100644
--- a/ansible/roles/ironic-enrolment/tasks/main.yml
+++ b/ansible/roles/ironic-enrolment/tasks/main.yml
@@ -34,7 +34,9 @@
     - "{{ ironic_deploy_ramdisk }}"
   # ironic_deploy_kernel/ramdisk default to none. We don't need to know them
   # for enrolment to continue.
-  when: item is not none
+  when:
+    - item is not none
+    - item != ""
   register: deploy_image_ids
   changed_when: false