diff options
| author | Rabi Mishra <ramishra@redhat.com> | 2019-08-15 14:54:28 +0530 |
|---|---|---|
| committer | Rabi Mishra <ramishra@redhat.com> | 2019-12-03 09:35:08 +0530 |
| commit | 54f1119d695270bc0b92a27c84e332b102846b51 (patch) | |
| tree | 9857443005ce88dbdd8d4523a974c7aba15004bf | |
| parent | 70962a434e88cb564443e3956d66dc14ad9ff933 (diff) | |
| download | heat-54f1119d695270bc0b92a27c84e332b102846b51.tar.gz | |
Use client_retry_limit for keystone connection retry
Use the existing client_retry_limit option.
Change-Id: If3dd260cad088c9783e4c31ba18d7f261f7d68c9
Closes-Bug: #1840235
Task: 36287
| -rw-r--r-- | heat/common/context.py | 3 | ||||
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/heat/common/context.py b/heat/common/context.py index c2b48611a..bc516030d 100644 --- a/heat/common/context.py +++ b/heat/common/context.py @@ -38,6 +38,8 @@ from heat.engine import clients LOG = logging.getLogger(__name__) +cfg.CONF.import_opt('client_retry_limit', 'heat.common.config') + # Note, we yield the options via list_opts to enable generation of the # sample heat.conf, but we don't register these options directly via # cfg.CONF.register*, it's done via ks_loading.register_auth_conf_options @@ -122,6 +124,7 @@ class RequestContext(context.RequestContext): self._session = None self._clients = None self._keystone_session = session.Session( + connect_retries=cfg.CONF.client_retry_limit, **config.get_ssl_options('keystone')) self.trust_id = trust_id self.trustor_user_id = trustor_user_id diff --git a/lower-constraints.txt b/lower-constraints.txt index e7bd5f3fd..b0678d3db 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -42,7 +42,7 @@ jmespath==0.9.3 jsonpatch==1.21 jsonpointer==2.0 jsonschema==2.6.0 -keystoneauth1==3.4.0 +keystoneauth1==3.18.0 keystonemiddleware==4.17.0 kombu==4.0.0 linecache2==1.0.0 diff --git a/requirements.txt b/requirements.txt index a194c349d..656bfaca2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ Babel!=2.4.0,>=2.3.4 # BSD croniter>=0.3.4 # MIT License cryptography>=2.1 # BSD/Apache-2.0 eventlet!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0,!=0.25.0,>=0.18.2 # MIT -keystoneauth1>=3.4.0 # Apache-2.0 +keystoneauth1>=3.18.0 # Apache-2.0 keystonemiddleware>=4.17.0 # Apache-2.0 lxml!=3.7.0,>=3.4.1 # BSD netaddr>=0.7.18 # BSD |