summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-07-28 17:14:52 +0800
committermeimei <meimei@huawei.com>2016-08-03 14:58:04 +0800
commitdf4298ad8d7a6323eeffb61a997f087746e35256 (patch)
tree7c4ba4b621d56acd76a7d65e14623b48db788ede
parentebd48fb22672ba26b05ee638a4aac7cd0b456f8d (diff)
[compass] change the cmd of getting endpoint because of ugly warnings
Change-Id: I5082a6fb3a2d27d17753cf42dc1555cbb3d8eb9a Signed-off-by: meimei <meimei@huawei.com>
-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"