From: zhifeng.jiang <jiang.zhifeng@zte.com.cn>
Date: Tue, 14 Jun 2016 12:12:29 +0000 (+0800)
Subject: Fix the "The controller is not up" problem caused by the fuel9.0 changing the online... 
X-Git-Tag: colorado.1.0~373
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F15521%2F1;p=releng.git

Fix the "The controller is not up" problem caused by the fuel9.0 changing the online state form "True" to "1".

JIRA:QTIP-85

Change-Id: Iaa07af84954bb590801336f2ca44e621c97baeb9
Signed-off-by: zhifeng.jiang <jiang.zhifeng@zte.com.cn>
---

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 88e6b4a69..8f5aa0800 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -82,7 +82,7 @@ if [ "$installer_type" == "fuel" ]; then
 
     # Check if controller is alive (online='True')
     controller_ip=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \
-        'fuel node | grep controller | grep True | awk "{print \$10}" | tail -1') &> /dev/null
+        'fuel node | grep controller | grep "True\|  1" | awk "{print \$10}" | tail -1') &> /dev/null
 
     if [ -z $controller_ip ]; then
         error "The controller $controller_ip is not up. Please check that the POD is correctly deployed."