From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Tue, 24 Jan 2017 20:18:05 +0000 (+0100)
Subject: [Fuel] [Functest] Change AUTH_URL to use v3 in the RC file
X-Git-Tag: danube.1.0~422^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F27469%2F3;p=releng.git

[Fuel] [Functest] Change AUTH_URL to use v3 in the RC file

Although Fuel default RC file sets export OS_IDENTITY_API_VERSION=3,
the AUTH_URL is poiting to ip:port.
By adding /v3 at the end of the URL, some API calls work.

Change-Id: I745e38524cef6105c23950f318d392e7473366bf
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 856f69a27..c1e21f316 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -121,6 +121,14 @@ if [ "$installer_type" == "fuel" ]; then
     # but sometimes the output of endpoint-list is like this: http://172.30.9.70:8004/v1/%(tenant_id)s
     # Fuel virtual need a fix
 
+    #convert to v3 URL
+    auth_url=$(cat $dest_path|grep AUTH_URL)
+    if [[ -z `echo $auth_url |grep v3` ]]; then
+        auth_url=$(echo $auth_url |sed "s|'$|v3&|")
+    fi
+    sed -i '/AUTH_URL/d' $dest_path
+    echo $auth_url >> $dest_path
+
 elif [ "$installer_type" == "apex" ]; then
     verify_connectivity $installer_ip