diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2015-06-30 10:05:27 +0200 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2015-06-30 10:05:27 +0200 |
| commit | 39cb29545d05286c8c1f2b9580b0b850e9488d59 (patch) | |
| tree | 3c0394fc5cc2b24b2a5591fb8b0823e0602ddf08 | |
| parent | c9d7b0e0a3fb35cd6b059e05979b79e2640db301 (diff) | |
fetch_os_creds.sh : small correction for Fuel to grab the public API correctly
JIRA: FUNCTEST-16
Change-Id: I6a8d1ff2a58c599cd84426d580024bd962fae51f
Signed-off-by: jose.lausuch <jose.lausuch@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 2ce81d8d1..48498b70c 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -88,10 +88,10 @@ if [ "$installer_type" == "fuel" ]; then sshpass -p r00tme scp 2>/dev/null $ssh_options root@${installer_ip}:~/openrc $dest_path &> /dev/null #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'/.$//') + 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; keystone endpoint-list'" \ - | grep $admin_ip | cut -d ' ' -f 12) + | grep $admin_ip | sed 's/ /\n/g' | grep ^http | head -1) #| 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 |