X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Ffetch_os_creds.sh;h=ac75950534d23c00c8e08c3cc553bbab0951d87f;hb=d52d285a54b03f63e61e0f51a80bb0fad316b478;hp=0873a68324de5590953f2afa597a8f078beebe7d;hpb=4ef7b78012e3665299cb933448f208783adf6031;p=releng.git diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index 0873a6832..ac7595053 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -167,11 +167,7 @@ elif [ "$installer_type" == "apex" ]; then sudo scp $ssh_options root@$installer_ip:/home/stack/overcloudrc.v3 $dest_path elif [ "$installer_type" == "compass" ]; then - if [ "${BRANCH}" == "master" ]; then - sudo docker cp compass-tasks:/opt/openrc $dest_path &> /dev/null - sudo chown $(whoami):$(whoami) $dest_path - sudo docker cp compass-tasks:/opt/os_cacert $os_cacert - else + if [ "${BRANCH}" == "stable/danube" ]; then verify_connectivity $installer_ip controller_ip=$(sshpass -p'root' ssh 2>/dev/null $ssh_options root@${installer_ip} \ 'mysql -ucompass -pcompass -Dcompass -e"select * from cluster;"' \ @@ -201,6 +197,10 @@ elif [ "$installer_type" == "compass" ]; then fi info "public_ip: $public_ip" swap_to_public $public_ip + else + sudo docker cp compass-tasks:/opt/openrc $dest_path &> /dev/null + sudo chown $(whoami):$(whoami) $dest_path + sudo docker cp compass-tasks:/opt/os_cacert $os_cacert fi elif [ "$installer_type" == "joid" ]; then