Merge "I will figure out how to add a check for this later"

[releng.git] / utils / fetch_os_creds.sh

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 34c81af..47fbc91 100755 (executable)
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -81,7 +81,7 @@ if [ "$installer_type" == "fuel" ]; then
     verify_connectivity $installer_ip
 
     env=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \
     verify_connectivity $installer_ip
 
     env=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \

-        'fuel env'|grep operational|tail -1|awk '{print $1}') &> /dev/null
+        'fuel env'|grep operational|head -1|awk '{print $1}') &> /dev/null

     if [ -z $env ]; then
         error "No operational environment detected in Fuel"
     fi
     if [ -z $env ]; then
         error "No operational environment detected in Fuel"
     fi


@@ -89,7 +89,7 @@ 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} \
 
     # Check if controller is alive (online='True')
     controller_ip=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \

-        'fuel node --env ${env_id} | grep controller | grep "True\|  1" | awk -F\| "{print \$5}" | tail -1' | \
+        "fuel node --env ${env_id} | grep controller | grep 'True\|  1' | awk -F\| '{print \$5}' | head -1" | \

         sed 's/ //g') &> /dev/null
 
     if [ -z $controller_ip ]; then
         sed 's/ //g') &> /dev/null
 
     if [ -z $controller_ip ]; then


@@ -142,14 +142,11 @@ elif [ "$installer_type" == "compass" ]; then
     sshpass -p root ssh 2>/dev/null $ssh_options root@${installer_ip} \
         "scp $ssh_options ${controller_ip}:/opt/admin-openrc.sh ." &> /dev/null
     sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:~/admin-openrc.sh $dest_path &> /dev/null
     sshpass -p root ssh 2>/dev/null $ssh_options root@${installer_ip} \
         "scp $ssh_options ${controller_ip}:/opt/admin-openrc.sh ." &> /dev/null
     sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:~/admin-openrc.sh $dest_path &> /dev/null

-    echo 'export OS_REGION_NAME=regionOne' >> $dest_path

 
     info "This file contains the mgmt keystone API, we need the public one for our rc file"
 
     info "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'/\/$//')
-    info "admin_ip: $admin_ip"

     public_ip=$(sshpass -p root ssh $ssh_options root@${installer_ip} \
     public_ip=$(sshpass -p root ssh $ssh_options root@${installer_ip} \

-        "ssh ${controller_ip} 'source /opt/admin-openrc.sh; keystone endpoint-list'" \
-        | grep $admin_ip | sed 's/ /\n/g' | grep ^http | head -1)
+        "ssh ${controller_ip} 'source /opt/admin-openrc.sh; openstack endpoint show identity '" \
+        | grep publicurl | awk '{print $4}')

     info "public_ip: $public_ip"
 
 
     info "public_ip: $public_ip"