openstack/heat
Code Issues Proposed changes

Support of regional endpoinds using Keystone v2

Browse Source 
Handles the configuration region_name_for_services
with the keystone V2 authentication.

Change-Id: Ibba4d617937da8ba6018471e9614259e90409a47
This commit is contained in:
Fabien Boucher 2014-06-02 18:52:04 +02:00
parent 61bd5f30f2
commit e7d3454c2d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
View File

@ -64,7 +64,8 @@ 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
} }
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

3
contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
View File

@ -58,6 +58,7 @@ class KeystoneClientTest(HeatTestCase):
cacert=None, cacert=None,
cert=None, cert=None,
insecure=False, insecure=False,
region=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':
@ -70,6 +71,7 @@ class KeystoneClientTest(HeatTestCase):
cacert=None, cacert=None,
cert=None, cert=None,
insecure=False, insecure=False,
region=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':
@ -81,6 +83,7 @@ class KeystoneClientTest(HeatTestCase):
cacert=None, cacert=None,
cert=None, cert=None,
insecure=False, insecure=False,
region=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'