From fb664d518842aa1a6a03b067f8767446b7f01714 Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Fri, 19 Jul 2019 22:09:48 +0000
Subject: [PATCH] Revert "Add logic to determine Ironic node is HW or not into
 configure_ironic_dirs"

This is due to a failure in the logic where the UEFI
firmware objects are copied along with the ipxe loader.

tl;dr we need to have two separate if statements.

This reverts commit 0913c948423ed6c8ba147cf4e2a5a4de6945ec96.

Change-Id: Iaf78462a8b4abf4ad9c294c8575c67f5ade40a40
---
 devstack/lib/ironic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 01588bf235..0b9f5808ac 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -1127,7 +1127,7 @@ function configure_ironic_dirs {
         setup_syslinux_modules
     fi
 
-    if [[ "$IRONIC_BOOT_MODE" == "uefi" && "$IRONIC_IS_HARDWARE" == "False" ]]; then
+    if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then
         local uefi_boot_file
         local uefi_loader
         local uefi_nvram