From 53a93ad49d5ffcd1ae76747ca826676e4c4ef5cb Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Mon, 2 Feb 2015 17:58:05 -0500
Subject: [PATCH] Partial revert of 4606716 until we debug further
This patch partially reverts 46067160e6787631fb5a55193a02794449f22ebf
which breaks deployment on some distros (Fedora). Using this
patch fixes deployment when trying to deploy on a real baremetal
undercloud using Fedora (my dev environment).
Not doing a full revert because this patch was large and it now
causes conflicts to revert cleanly.
Partial bug: 1417307
Change-Id: I2a4f5c4f6ef22092ca97734d02b54838f38b0602
---
ironic/drivers/modules/deploy_utils.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ironic/drivers/modules/deploy_utils.py b/ironic/drivers/modules/deploy_utils.py
index 3b01172b5c..712aa5fbd3 100644
--- a/ironic/drivers/modules/deploy_utils.py
+++ b/ironic/drivers/modules/deploy_utils.py
@@ -86,6 +86,8 @@ def login_iscsi(portal_address, portal_port, target_iqn):
check_exit_code=[0],
attempts=5,
delay_on_retry=True)
+ # NOTE(dprince): partial revert of 4606716 until we debug further
+ time.sleep(3)
# Ensure the login complete
verify_iscsi_connection(target_iqn)
# force iSCSI initiator to re-read luns