From: Stefan K. Berg <stefan.k.berg@ericsson.com>
Date: Mon, 20 Jun 2016 14:07:36 +0000 (+0200)
Subject: Fix to correct IP address logic in previous change
X-Git-Tag: colorado.1.0~340
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F15879%2F2;p=releng.git

Fix to correct IP address logic in previous change

Commit 622002bea0a0eda42e9a76d14af4bdff47c692d6 is breaking the
Fuel Yardstick testing, this is an emergency fix.

The change introduced spaces in the controller_ip address,
breaking later ssh and scp commands!

Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Change-Id: Ied329103a3568c523ec8ab16a7df5a4763ec14b3
---

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index a8eee3dd0..c240976d8 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -82,7 +82,8 @@ 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\|  1" | awk -F\| "{print \$5}" | tail -1') &> /dev/null
+        'fuel node | grep controller | grep "True\|  1" | awk -F\| "{print \$5}" | tail -1' | \
+        sed 's/ //g') &> /dev/null
 
     if [ -z $controller_ip ]; then
         error "The controller $controller_ip is not up. Please check that the POD is correctly deployed."