From 43aff0ce171bcdae195a0c53f2050029e21ae6cf Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Wed, 19 Apr 2017 20:45:31 +0300
Subject: [PATCH] [osclients] do not always strip auth_url

* add check that version suffix is presented in the auth_url of keystone
  before trying to crop it.
* port devstack plugin to use AUTH_URL env variable

Change-Id: Ib3c56ad0f945787d4df49308deb08bc87199c546
---
 devstack/lib/rally | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devstack/lib/rally b/devstack/lib/rally
index 843f8004..e2c03c58 100644
--- a/devstack/lib/rally
+++ b/devstack/lib/rally
@@ -52,7 +52,7 @@ then
     "type": "ExistingCloud",
     "creds": {
         "openstack": {
-            "auth_url": "$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION",
+            "auth_url": "$OS_AUTH_URL",
             "region_name": "$REGION_NAME",
             "admin": {
                 "username": "admin",
@@ -71,7 +71,7 @@ then
     "type": "ExistingCloud",
     "creds": {
         "openstack": {
-            "auth_url": "$KEYSTONE_AUTH_URI_V3",
+            "auth_url": "$OS_AUTH_URL",
             "region_name": "$REGION_NAME",
             "admin": {
                 "username": "admin",