diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-05 19:40:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-05 19:40:59 +0000 |
| commit | bd318da98b12897bf98931873c108395e4e596b1 (patch) | |
| tree | 8b6362acaba49d0ca0ebc9c7878111f186098460 /heat | |
| parent | fd92c98dec6d6477ee920f020e9217745f3465f8 (diff) | |
| parent | c7cc740f307ce8ffdf36c29094c9cbce5a6c8d14 (diff) | |
| download | heat-bd318da98b12897bf98931873c108395e4e596b1.tar.gz | |
Merge "Add connect_retries when creating domain_admin_client"
Diffstat (limited to 'heat')
| -rw-r--r-- | heat/engine/clients/os/keystone/heat_keystoneclient.py | 1 | ||||
| -rw-r--r-- | heat/tests/clients/test_heat_client.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/heat/engine/clients/os/keystone/heat_keystoneclient.py b/heat/engine/clients/os/keystone/heat_keystoneclient.py index c35a1f058..8713b9dca 100644 --- a/heat/engine/clients/os/keystone/heat_keystoneclient.py +++ b/heat/engine/clients/os/keystone/heat_keystoneclient.py @@ -157,6 +157,7 @@ class KsClientWrapper(object): self._domain_admin_client = kc_v3.Client( session=self.session, auth=self.domain_admin_auth, + connect_retries=cfg.CONF.client_retry_limit, region_name=self.auth_region_name) return self._domain_admin_client diff --git a/heat/tests/clients/test_heat_client.py b/heat/tests/clients/test_heat_client.py index 1c8265e07..0ceb6d39f 100644 --- a/heat/tests/clients/test_heat_client.py +++ b/heat/tests/clients/test_heat_client.py @@ -86,6 +86,7 @@ class KeystoneClientTest(common.HeatTestCase): self.m_client.assert_called_once_with( session=utils.AnyInstance(ks_session.Session), auth=self.mock_ks_auth, + connect_retries=2, region_name=None) def _stubs_auth(self, method='token', trust_scoped=True, @@ -1519,6 +1520,7 @@ class KeystoneClientTestDomainName(KeystoneClientTest): self.m_client.assert_called_once_with( session=utils.AnyInstance(ks_session.Session), auth=self.mock_ks_auth, + connect_retries=2, region_name=None) def _stub_domain_admin_client(self, domain_id='adomain123'): |