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
This commit is contained in:
wangxiyuan
2016-05-25 18:08:53 +08:00
parent 67f8f5c722
commit 1ef277f7a0

View File

@@ -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'],