Merge "Fix a wrong argument name at Heat keystoneclient plugin"
This commit is contained in:
commit
af1de565ab
@ -65,7 +65,7 @@ class KeystoneClientV2(object):
|
|||||||
def _v2_client_init(self):
|
def _v2_client_init(self):
|
||||||
kwargs = {
|
kwargs = {
|
||||||
'auth_url': self.context.auth_url,
|
'auth_url': self.context.auth_url,
|
||||||
'region': cfg.CONF.region_name_for_services
|
'region_name': cfg.CONF.region_name_for_services
|
||||||
}
|
}
|
||||||
auth_kwargs = {}
|
auth_kwargs = {}
|
||||||
# Note try trust_id first, as we can't reuse auth_token in that case
|
# Note try trust_id first, as we can't reuse auth_token in that case
|
||||||
|
@ -58,7 +58,7 @@ class KeystoneClientTest(HeatTestCase):
|
|||||||
cacert=None,
|
cacert=None,
|
||||||
cert=None,
|
cert=None,
|
||||||
insecure=False,
|
insecure=False,
|
||||||
region=None,
|
region_name=None,
|
||||||
key=None).AndReturn(self.mock_ks_client)
|
key=None).AndReturn(self.mock_ks_client)
|
||||||
self.mock_ks_client.authenticate().AndReturn(auth_ok)
|
self.mock_ks_client.authenticate().AndReturn(auth_ok)
|
||||||
elif method == 'password':
|
elif method == 'password':
|
||||||
@ -71,7 +71,7 @@ class KeystoneClientTest(HeatTestCase):
|
|||||||
cacert=None,
|
cacert=None,
|
||||||
cert=None,
|
cert=None,
|
||||||
insecure=False,
|
insecure=False,
|
||||||
region=None,
|
region_name=None,
|
||||||
key=None).AndReturn(self.mock_ks_client)
|
key=None).AndReturn(self.mock_ks_client)
|
||||||
self.mock_ks_client.authenticate().AndReturn(auth_ok)
|
self.mock_ks_client.authenticate().AndReturn(auth_ok)
|
||||||
if method == 'trust':
|
if method == 'trust':
|
||||||
@ -83,7 +83,7 @@ class KeystoneClientTest(HeatTestCase):
|
|||||||
cacert=None,
|
cacert=None,
|
||||||
cert=None,
|
cert=None,
|
||||||
insecure=False,
|
insecure=False,
|
||||||
region=None,
|
region_name=None,
|
||||||
key=None).AndReturn(self.mock_ks_client)
|
key=None).AndReturn(self.mock_ks_client)
|
||||||
self.mock_ks_client.authenticate(trust_id='atrust123',
|
self.mock_ks_client.authenticate(trust_id='atrust123',
|
||||||
tenant_id='test_tenant_id'
|
tenant_id='test_tenant_id'
|
||||||
|
Loading…
Reference in New Issue
Block a user