summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-08-04 07:36:10 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-04 07:36:10 +0000
commit7ecfd3b34310ef43e845baf28c177a8f1cfbacc4 (patch)
tree85378394e32a98bddbe9cb2966c9578a5b1b6b76
parent2a56fa67c513dc9de808ec36ca1cf42d786024a9 (diff)
parentdf4298ad8d7a6323eeffb61a997f087746e35256 (diff)
Merge "[compass] change the cmd of getting endpoint because of ugly warnings"
-rwxr-xr-xutils/fetch_os_creds.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 0f4b25db8..e11df599b 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -145,11 +145,9 @@ elif [ "$installer_type" == "compass" ]; then
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"
- 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} \
- "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"