fetch_os_creds.sh : small correction for Fuel to grab the public API correctly

JIRA: FUNCTEST-16

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

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 2ce81d8..48498b7 100755 (executable)
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -88,10 +88,10 @@ if [ "$installer_type" == "fuel" ]; then
     sshpass -p r00tme scp 2>/dev/null $ssh_options root@${installer_ip}:~/openrc $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'/.$//')
+    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 | cut -d ' ' -f 12)
+        | grep $admin_ip | sed 's/ /\n/g' | grep ^http | head -1)
         #| 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