summaryrefslogtreecommitdiff
path: root/heat/engine/clients/os/cinder.py
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-09-10 15:33:04 +0000
committerGerrit Code Review <review@openstack.org>2019-09-10 15:33:04 +0000
commit06f8ee55241911797517eef3474af47ef58fbff2 (patch)
tree7aeb570c419d26a2b55613b1adb7dd0030400df2 /heat/engine/clients/os/cinder.py
parent467883204627b2969c93d9789dc49bdcbd759551 (diff)
parent494c7a3c52c370a3f29c3eef3a5d92b3c4ff8648 (diff)
downloadheat-06f8ee55241911797517eef3474af47ef58fbff2.tar.gz
Merge "Use connect_retries when creating clients" into stable/rocky
Diffstat (limited to 'heat/engine/clients/os/cinder.py')
-rw-r--r--heat/engine/clients/os/cinder.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/heat/engine/clients/os/cinder.py b/heat/engine/clients/os/cinder.py
index 7e876efd5..7ffce206c 100644
--- a/heat/engine/clients/os/cinder.py
+++ b/heat/engine/clients/os/cinder.py
@@ -14,6 +14,7 @@
from cinderclient import client as cc
from cinderclient import exceptions
from keystoneauth1 import exceptions as ks_exceptions
+from oslo_config import cfg
from oslo_log import log as logging
from heat.common import exception
@@ -62,6 +63,7 @@ class CinderClientPlugin(client_plugin.ClientPlugin):
'interface': self.interface,
'service_type': self.service_type,
'region_name': self._get_region_name(),
+ 'connect_retries': cfg.CONF.client_retry_limit,
'http_log_debug': self._get_client_option(CLIENT_NAME,
'http_log_debug')
}