From 1ef277f7a0ef2436997f9dd1764306eba845f60e Mon Sep 17 00:00:00 2001
From: wangxiyuan <wangxiyuan@huawei.com>
Date: Wed, 25 May 2016 18:08:53 +0800
Subject: [PATCH] Fix the zaqar functional test job

This devstack patch: https://review.openstack.org/#/c/193894/24 used
proxy url for mod_wsgi keystone.

This is a quick fix for functional test. The best way is to migrate
to keystone v3. We should update asap.

Change-Id: I6da301dc4935ec8e4254d71ca93036f3d8db2bcf
---
 zaqarclient/tests/base.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zaqarclient/tests/base.py b/zaqarclient/tests/base.py
index f70853c8..173b22e8 100644
--- a/zaqarclient/tests/base.py
+++ b/zaqarclient/tests/base.py
@@ -82,6 +82,9 @@ class TestBase(testtools.TestCase):
         auth_url = self.creds['auth_url']
         if not parsed_url.path or parsed_url.path == '/':
             auth_url = urllib_parse.urljoin(self.creds['auth_url'], 'v2.0')
+        if (parsed_url.path == '/identity_v2_admin' or
+                parsed_url.path == '/identity'):
+            auth_url = '%s/v2.0' % auth_url
 
         self.conf['auth_opts']['backend'] = 'keystone'
         options = {'os_username': self.creds['username'],