From: QiLiang <liangqi1@huawei.com>
Date: Fri, 28 Oct 2016 04:52:39 +0000 (+0800)
Subject: Workaround for random wait compass boot timeout
X-Git-Tag: colorado.3.0~14^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F24841%2F1;p=compass4nfv.git

Workaround for random wait compass boot timeout

JIRA: -

Sometimes compass-core already boot successfully, but wait_ok function
retry to ssh login to compass-core vm failed. Add two more times retry
before exit the deployment.

Change-Id: I1ae7795b2196e9a24c24c2368402e560aba68339
Signed-off-by: QiLiang <liangqi1@huawei.com>
(cherry picked from commit 12880abb62fdb46afdcfa929e3fdb251b1e73814)
---

diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh
index dc391acc..0c213e31 100755
--- a/deploy/compass_vm.sh
+++ b/deploy/compass_vm.sh
@@ -59,7 +59,16 @@ function wait_ok() {
         sleep 1
         let retry+=1
         if [[ $retry -ge $1 ]];then
-            timeout 1s ssh $ssh_args root@$MGMT_IP "exit"
+            # first try
+            ssh $ssh_args root@$MGMT_IP "exit"
+            # second try
+            ssh $ssh_args root@$MGMT_IP "exit"
+            exit_status=$?
+            if [[ $exit_status == 0 ]]; then
+                log_warn "final ssh login compass success !!!"
+                break
+            fi
+            log_error "final ssh retry failed with status: " $exit_status
             log_error "os install time out"
             exit 1
         fi