diff options
| author |   Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2017-01-11 11:20:58 +0100 |
|---|---|---|
| committer | Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2017-01-11 11:20:58 +0100 |
| commit | f74b4479817e4d3046d66e6209050b7d96d31588 (patch) | |
| tree | b0fdf9d2362ab42a575298a6ae80f5dbdad23969 | |
| parent | a118fb20de84cd422daa8e263b3c50f43079d436 (diff) | |
[Functest][Keystone] --long argument not available anymore
For newton we have to grep differently for the public ip.
Change-Id: I646358005b163829004e0016514e254575d03157
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
| -rwxr-xr-x | utils/fetch_os_creds.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index ecc571dba..775b291e1 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -104,8 +104,8 @@ if [ "$installer_type" == "fuel" ]; then #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'/\/$//') public_ip=$(sshpass -p r00tme ssh $ssh_options root@${installer_ip} \ - "ssh ${controller_ip} 'source openrc; openstack endpoint list --long'" \ - | grep $admin_ip | sed 's/ /\n/g' | grep ^http | head -1) &> /dev/null + "ssh ${controller_ip} 'source openrc; openstack endpoint list'" \ + | grep keystone | grep public | sed 's/ /\n/g' | grep ^http | head -1) &> /dev/null #| grep http | head -1 | cut -d '|' -f 4 | sed 's/v1\/.*/v1\//' | sed 's/ //g') &> /dev/null #NOTE: this is super ugly sed 's/v1\/.*/v1\//'OS_AUTH_URL # but sometimes the output of endpoint-list is like this: http://172.30.9.70:8004/v1/%(tenant_id)s |