diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-09-29 03:38:40 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2017-09-29 03:40:17 +0000 |
| commit | 250d6cffbc53074d84971bffec1395322eb5a3ab (patch) | |
| tree | bf0d913874c0640eb745ed5c4cee20b950bc2946 /utils | |
| parent | 1227194755c45dc9532d6566ad1ee9af757fbce7 (diff) | |
Compass: fetch openrc for euphrates
Change-Id: I22df519d949fb28eaecc6af99347868023a1e2a8
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/fetch_os_creds.sh | 10 |
1 files changed, 5 insertions, 5 deletions
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 |