X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Ffetch_os_creds.sh;h=458bbda3b0b30b15149df4f7d5796b7154837ea3;hb=82efe6ad203fe95ce8a092e5a9a85e326aaef7d7;hp=f00e022f90d33b24430fac259ec98fd510eaaac9;hpb=5ca936001bf36d177f81131de079b4ff314e5cc2;p=releng.git

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index f00e022f9..458bbda3b 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -7,7 +7,9 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-
+set -o errexit
+set -o nounset
+set -o pipefail
 
 usage() {
     echo "usage: $0 [-v] -d <destination> -i <installer_type> -a <installer_ip>" >&2
@@ -138,7 +140,7 @@ elif [ "$installer_type" == "apex" ]; then
     if [ -f /root/.ssh/id_rsa ]; then
         chmod 600 /root/.ssh/id_rsa
     fi
-    sudo scp $ssh_options root@$installer_ip:/home/stack/overcloudrc $dest_path
+    sudo scp $ssh_options root@$installer_ip:/home/stack/overcloudrc.v3 $dest_path
 
 elif [ "$installer_type" == "compass" ]; then
     verify_connectivity $installer_ip
@@ -157,8 +159,8 @@ elif [ "$installer_type" == "compass" ]; then
     sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:~/admin-openrc.sh $dest_path &> /dev/null
 
     info "This file contains the mgmt keystone API, we need the public one for our rc file"
-    grep "OS_AUTH_URL.*v2" $dest_path > /dev/null 2>&1
-    if [ $?  -eq 0 ] ; then
+
+    if grep "OS_AUTH_URL.*v2" $dest_path > /dev/null 2>&1 ; then
         public_ip=$(sshpass -p root ssh $ssh_options root@${installer_ip} \
             "ssh ${controller_ip} 'source /opt/admin-openrc.sh; openstack endpoint show identity '" \
             | grep publicurl | awk '{print $4}')
@@ -201,6 +203,17 @@ elif [ "$installer_type" == "foreman" ]; then
         'source keystonerc_admin;keystone endpoint-list'" \
         | grep $admin_ip | sed 's/ /\n/g' | grep ^http | head -1) &> /dev/null
 
+elif [ "$installer_type" == "daisy" ]; then
+    verify_connectivity $installer_ip
+    cluster=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \
+            "source ~/daisyrc_admin; daisy cluster-list"|grep active|head -1|awk -F "|" '{print $3}') &> /dev/null
+    if [ -z $cluster ]; then
+        echo "No active cluster detected in daisy"
+        exit 1
+    fi
+
+    sshpass -p r00tme scp 2>/dev/null $ssh_options root@${installer_ip}:/etc/kolla/admin-openrc.sh $dest_path &> /dev/null
+
 else
     error "Installer $installer is not supported by this script"
 fi
@@ -212,5 +225,3 @@ fi
 
 echo "-------- Credentials: --------"
 cat $dest_path
-
-exit 0