diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-16 07:34:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-16 07:34:49 +0000 |
| commit | 2dd83353c086a8ee3ee8aefb99b06832782d8cab (patch) | |
| tree | dc0a99e05fb6e3bfb8006387f6827e9d81bbb5d6 | |
| parent | 8f6d3c27377db2ad6009ae4c71510d1cc1ed3f9b (diff) | |
| parent | b38ff79afeb5f64ee70e39c713df1cf21becdba3 (diff) | |
| download | heat-2dd83353c086a8ee3ee8aefb99b06832782d8cab.tar.gz | |
Merge "Use region_name when creating keystone client" into stable/ocata8.0.0.0rc28.0.0
| -rw-r--r-- | heat/engine/clients/os/keystone/heat_keystoneclient.py | 10 | ||||
| -rw-r--r-- | heat/tests/clients/test_heat_client.py | 9 |
2 files changed, 14 insertions, 5 deletions
diff --git a/heat/engine/clients/os/keystone/heat_keystoneclient.py b/heat/engine/clients/os/keystone/heat_keystoneclient.py index adf4560f4..26cf969bf 100644 --- a/heat/engine/clients/os/keystone/heat_keystoneclient.py +++ b/heat/engine/clients/os/keystone/heat_keystoneclient.py @@ -120,6 +120,10 @@ class KsClientWrapper(object): 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: # Note we must specify the domain when getting the token @@ -148,12 +152,14 @@ class KsClientWrapper(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) + client = kc_v3.Client(session=self.session, + region_name=self.region_name) if hasattr(self.context.auth_plugin, 'get_access'): # NOTE(jamielennox): get_access returns the current token without diff --git a/heat/tests/clients/test_heat_client.py b/heat/tests/clients/test_heat_client.py index dfa2719e4..f653b2368 100644 --- a/heat/tests/clients/test_heat_client.py +++ b/heat/tests/clients/test_heat_client.py @@ -95,7 +95,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 @@ -139,7 +140,8 @@ class KeystoneClientTest(common.HeatTestCase): p.AndReturn(mock_ks_auth) 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) if stub_trust_context: @@ -1532,7 +1534,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 |