From: meimei <meimei@huawei.com>
Date: Thu, 28 Jul 2016 09:14:52 +0000 (+0800)
Subject: [compass] change the cmd of getting endpoint because of ugly warnings
X-Git-Tag: colorado.1.0~198^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=df4298ad8d7a6323eeffb61a997f087746e35256;p=releng.git

[compass] change the cmd of getting endpoint because of ugly warnings

Change-Id: I5082a6fb3a2d27d17753cf42dc1555cbb3d8eb9a
Signed-off-by: meimei <meimei@huawei.com>
---

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"