summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-06-20 16:07:36 +0200
committerStefan K. Berg <stefan.k.berg@ericsson.com>2016-06-20 16:17:00 +0200
commita0ce2546d6de3f196da3affe70653318ec4137f6 (patch)
tree068bf738b8ae5d635cde8d53255f536847209fd6
parentc2a43b06c9e5844ef4e67be2c13d63facf82f560 (diff)
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
-rwxr-xr-xutils/fetch_os_creds.sh3
1 files changed, 2 insertions, 1 deletions
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."