Pin the target keystone endpoint to the context auth url
Additional fix needed for continued support of keystone v2 after the auth code refactor Change-Id: I37c17d1a8ba79e4fe59e18e7060b3448e9c54261
This commit is contained in:
parent
7f2521895d
commit
62a438f894
|
@ -65,6 +65,7 @@ class KeystoneClientV2(object):
|
|||
def _v2_client_init(self):
|
||||
kwargs = {
|
||||
'auth_url': self.context.auth_url,
|
||||
'endpoint': self.context.auth_url,
|
||||
'region_name': cfg.CONF.region_name_for_services
|
||||
}
|
||||
|
||||
|
|
|
@ -52,6 +52,7 @@ class KeystoneClientTest(common.HeatTestCase):
|
|||
if method == 'token':
|
||||
heat_keystoneclient.kc.Client(
|
||||
auth_url=mox.IgnoreArg(),
|
||||
endpoint=mox.IgnoreArg(),
|
||||
tenant_name='test_tenant',
|
||||
token='abcd1234',
|
||||
cacert=None,
|
||||
|
@ -63,6 +64,7 @@ class KeystoneClientTest(common.HeatTestCase):
|
|||
elif method == 'password':
|
||||
heat_keystoneclient.kc.Client(
|
||||
auth_url=mox.IgnoreArg(),
|
||||
endpoint=mox.IgnoreArg(),
|
||||
tenant_name='test_tenant',
|
||||
tenant_id='test_tenant_id',
|
||||
username='test_username',
|
||||
|
@ -76,6 +78,7 @@ class KeystoneClientTest(common.HeatTestCase):
|
|||
if method == 'trust':
|
||||
heat_keystoneclient.kc.Client(
|
||||
auth_url='http://server.test:5000/v2.0',
|
||||
endpoint='http://server.test:5000/v2.0',
|
||||
password='verybadpass',
|
||||
tenant_name='service',
|
||||
username='heat',
|
||||
|
|
Loading…
Reference in New Issue