Get vars from env for fetch_os_creds.sh

[releng.git] / utils / fetch_os_creds.sh

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 2ce81d8..cd53dac 100755 (executable)
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -52,12 +52,16 @@ while getopts ":d:i:a:h:" optchar; do
     esac
 done
 
+# set vars from env if not provided by user as options
+dest_path=${dest_path:-$HOME/opnfv-openrc.sh}
+installer_type=${installer_type:-$INSTALLER_TYPE}
+installer_ip=${installer_ip:-$INSTALLER_IP}
+
 if [ -z $dest_path ] || [ -z $installer_type ] || [ -z $installer_ip ]; then
     usage
     exit 2
 fi
 
-
 # Checking if destination path is valid
 if [ -d $dest_path ]; then
     error "Please provide the full destination path for the credentials file including the filename"
@@ -88,10 +92,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