summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-09-06 19:17:46 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-06 19:17:46 +0000
commitce2a3a1b7e63bbd150f86361123d1d43838c03af (patch)
tree1af7e1a3cb0f325b669b74e54db2ce183195aa64
parentec1894a50af849d6c028955330a77f2b19815a00 (diff)
parent2d7755019827d443715ea6cd666e83d721d3f680 (diff)
Merge "deploy: Attempt fixing random deploy timeouts" into stable/colorado
-rw-r--r--patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch b/patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch
index f0016892..94b3071e 100644
--- a/patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch
+++ b/patches/opnfv-fuel/0039-deploy-Fix-add-bootstrap-DEA-override-delay.patch
@@ -8,18 +8,19 @@ one minute sleep before checking for completition of fuel install.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- deploy/install_fuel_master.py | 1 +
- 1 file changed, 1 insertion(+)
+ deploy/install_fuel_master.py | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/deploy/install_fuel_master.py b/deploy/install_fuel_master.py
-index 808d0b1..609a335 100644
+index 808d0b1..404474c 100644
--- a/deploy/install_fuel_master.py
+++ b/deploy/install_fuel_master.py
-@@ -201,6 +201,7 @@ class InstallFuelMaster(object):
+@@ -201,6 +201,8 @@ class InstallFuelMaster(object):
CMD = 'ps -ef | grep %s | grep -v grep' % BOOTSTRAP_ADMIN
install_completed = False
+ time.sleep(60)
++ self.wait_for_node_up()
with self.ssh:
for i in range(WAIT_LOOP):
ret = self.ssh.exec_cmd(CMD)