Bugfix: corrected fetch credentials for foreman installer

JIRA: FUNCTEST-43

Change-Id: Id820ef2b2cd248dbc7baa6887312ae90a301a8a2
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index e412ceb..cefc857 100755 (executable)
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -95,7 +95,7 @@ if [ "$installer_type" == "fuel" ]; then
     admin_ip=$(cat $dest_path | grep "OS_AUTH_URL" | sed 's/^.*\=//' | sed "s/^\([\"']\)\(.*\)\1\$/\2/g" | sed s'/\/$//')
     public_ip=$(sshpass -p r00tme ssh $ssh_options root@${installer_ip} \
         "ssh ${controller_ip} 'source openrc; keystone endpoint-list'" \
-        | grep $admin_ip | sed 's/ /\n/g' | grep ^http | head -1)
+        | grep $admin_ip | sed 's/ /\n/g' | grep ^http | head -1) &> /dev/null
         #| grep http | head -1 | cut -d '|' -f 4 | sed 's/v1\/.*/v1\//' | sed 's/ //g') &> /dev/null
     #NOTE: this is super ugly sed 's/v1\/.*/v1\//'OS_AUTH_URL
     # but sometimes the output of endpoint-list is like this: http://172.30.9.70:8004/v1/%(tenant_id)s
@@ -119,10 +119,11 @@ elif [ "$installer_type" == "foreman" ]; then
     sshpass -p vagrant scp $ssh_options root@${installer_ip}:~/keystonerc_admin $dest_path &> /dev/null
 
     #This file contains the mgmt keystone API, we need the public one for our rc file
+    admin_ip=$(cat $dest_path | grep "OS_AUTH_URL" | sed 's/^.*\=//' | sed "s/^\([\"']\)\(.*\)\1\$/\2/g" | sed s'/\/$//')
     public_ip=$(sshpass -p vagrant ssh $ssh_options root@${installer_ip} \
         "sshpass -p Op3nStack ssh $ssh_options root@${controller} \
         'source keystonerc_admin;keystone endpoint-list'" \
-        | grep http | head -1 | cut -d '|' -f 4 | sed 's/ //g') &> /dev/null
+        | grep $admin_ip | sed 's/ /\n/g' | grep ^http | head -1) &> /dev/null
 
 elif [ "$installer_type" == "compass" ]; then
     #ip_compass="10.1.0.12"