openstack
/
heat
Code Issues Proposed changes

Merge "Use region_name when creating keystone client" into stable/mitaka

This commit is contained in:
Jenkins 2017-02-17 18:41:48 +00:00 committed by Gerrit Code Review
parent 9548f6f69d 674b36f235
commit c0ac4c3cb0
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/common/heat_keystoneclient.py
View File

@ -111,6 +111,10 @@ class KeystoneClientV3(object):
self._client = self._v3_client_init()
return self._client
@property
def region_name(self):
return self.context.region_name or cfg.CONF.region_name_for_services
@property
def domain_admin_auth(self):
if not self._domain_admin_auth:
@ -140,13 +144,15 @@ class KeystoneClientV3(object):
if not self._domain_admin_client:
self._domain_admin_client = kc_v3.Client(
session=self.session,
auth=self.domain_admin_auth)
auth=self.domain_admin_auth,
region_name=self.region_name)
return self._domain_admin_client
def _v3_client_init(self):
client = kc_v3.Client(session=self.session,
auth=self.context.auth_plugin)
auth=self.context.auth_plugin,
region_name=self.region_name)
if hasattr(self.context.auth_plugin, 'get_access'):
# NOTE(jamielennox): get_access returns the current token without

9
heat/tests/clients/test_heat_client.py
View File

@ -91,7 +91,8 @@ class KeystoneClientTest(common.HeatTestCase):
m.AndReturn(mock_ks_auth)
n = kc_v3.Client(session=mox.IsA(ks_session.Session),
auth=mock_ks_auth)
auth=mock_ks_auth,
region_name=None)
n.AndReturn(self.mock_admin_client)
self.mock_admin_client.domains = self.mock_ks_v3_client_domain_mngr
@ -131,7 +132,8 @@ class KeystoneClientTest(common.HeatTestCase):
if client:
c = kc_v3.Client(session=mox.IsA(ks_session.Session),
auth=mock_ks_auth)
auth=mock_ks_auth,
region_name=None)
c.AndReturn(self.mock_ks_v3_client)
if stub_trust_context:
@ -1482,7 +1484,8 @@ class KeystoneClientTestDomainName(KeystoneClientTest):
m.AndReturn(mock_ks_auth)
n = kc_v3.Client(session=mox.IsA(ks_session.Session),
auth=mock_ks_auth)
auth=mock_ks_auth,
region_name=None)
n.AndReturn(self.mock_admin_client)
self.mock_admin_client.domains = self.mock_ks_v3_client_domain_mngr