Merge "Use region_name when creating keystone client" into stable/ocata
This commit is contained in:
commit
2dd83353c0
@ -119,6 +119,10 @@ class KsClientWrapper(object):
|
|||||||
self._client = self._v3_client_init()
|
self._client = self._v3_client_init()
|
||||||
return self._client
|
return self._client
|
||||||
|
|
||||||
|
@property
|
||||||
|
def region_name(self):
|
||||||
|
return self.context.region_name or cfg.CONF.region_name_for_services
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def domain_admin_auth(self):
|
def domain_admin_auth(self):
|
||||||
if not self._domain_admin_auth:
|
if not self._domain_admin_auth:
|
||||||
@ -148,12 +152,14 @@ class KsClientWrapper(object):
|
|||||||
if not self._domain_admin_client:
|
if not self._domain_admin_client:
|
||||||
self._domain_admin_client = kc_v3.Client(
|
self._domain_admin_client = kc_v3.Client(
|
||||||
session=self.session,
|
session=self.session,
|
||||||
auth=self.domain_admin_auth)
|
auth=self.domain_admin_auth,
|
||||||
|
region_name=self.region_name)
|
||||||
|
|
||||||
return self._domain_admin_client
|
return self._domain_admin_client
|
||||||
|
|
||||||
def _v3_client_init(self):
|
def _v3_client_init(self):
|
||||||
client = kc_v3.Client(session=self.session)
|
client = kc_v3.Client(session=self.session,
|
||||||
|
region_name=self.region_name)
|
||||||
|
|
||||||
if hasattr(self.context.auth_plugin, 'get_access'):
|
if hasattr(self.context.auth_plugin, 'get_access'):
|
||||||
# NOTE(jamielennox): get_access returns the current token without
|
# NOTE(jamielennox): get_access returns the current token without
|
||||||
|
@ -95,7 +95,8 @@ class KeystoneClientTest(common.HeatTestCase):
|
|||||||
m.AndReturn(mock_ks_auth)
|
m.AndReturn(mock_ks_auth)
|
||||||
|
|
||||||
n = kc_v3.Client(session=mox.IsA(ks_session.Session),
|
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)
|
n.AndReturn(self.mock_admin_client)
|
||||||
|
|
||||||
self.mock_admin_client.domains = self.mock_ks_v3_client_domain_mngr
|
self.mock_admin_client.domains = self.mock_ks_v3_client_domain_mngr
|
||||||
@ -139,7 +140,8 @@ class KeystoneClientTest(common.HeatTestCase):
|
|||||||
p.AndReturn(mock_ks_auth)
|
p.AndReturn(mock_ks_auth)
|
||||||
|
|
||||||
if client:
|
if client:
|
||||||
c = kc_v3.Client(session=mox.IsA(ks_session.Session))
|
c = kc_v3.Client(session=mox.IsA(ks_session.Session),
|
||||||
|
region_name=None)
|
||||||
c.AndReturn(self.mock_ks_v3_client)
|
c.AndReturn(self.mock_ks_v3_client)
|
||||||
|
|
||||||
if stub_trust_context:
|
if stub_trust_context:
|
||||||
@ -1532,7 +1534,8 @@ class KeystoneClientTestDomainName(KeystoneClientTest):
|
|||||||
m.AndReturn(mock_ks_auth)
|
m.AndReturn(mock_ks_auth)
|
||||||
|
|
||||||
n = kc_v3.Client(session=mox.IsA(ks_session.Session),
|
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)
|
n.AndReturn(self.mock_admin_client)
|
||||||
|
|
||||||
self.mock_admin_client.domains = self.mock_ks_v3_client_domain_mngr
|
self.mock_admin_client.domains = self.mock_ks_v3_client_domain_mngr
|
||||||
|
Loading…
Reference in New Issue
Block a user