summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-05 14:19:58 +0000
committerGerrit Code Review <review@openstack.org>2019-03-05 14:19:58 +0000
commitbde07bc95b5b5d16b829f72be7aaa62fab9d716a (patch)
tree879bd9ae8afa2db3199096bd79bce3d25df2119f
parent23afb2d631608a0a422e5b3b0b8dcedda9f5c285 (diff)
parent7b74cc9adb77f025190557e47f6dadae110e6ab5 (diff)
Merge "Fix rate semaphore for keystoneclient"HEAD3.13.1master
-rw-r--r--keystoneauth1/adapter.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/keystoneauth1/adapter.py b/keystoneauth1/adapter.py
index a15fd54..6bba62f 100644
--- a/keystoneauth1/adapter.py
+++ b/keystoneauth1/adapter.py
@@ -217,6 +217,8 @@ class Adapter(object):
217 kwargs.setdefault('client_name', self.client_name) 217 kwargs.setdefault('client_name', self.client_name)
218 if self.client_version: 218 if self.client_version:
219 kwargs.setdefault('client_version', self.client_version) 219 kwargs.setdefault('client_version', self.client_version)
220 if self._rate_semaphore:
221 kwargs.setdefault('rate_semaphore', self._rate_semaphore)
220 222
221 else: 223 else:
222 warnings.warn('Using keystoneclient sessions has been deprecated. ' 224 warnings.warn('Using keystoneclient sessions has been deprecated. '
@@ -232,8 +234,6 @@ class Adapter(object):
232 if self.raise_exc is not None: 234 if self.raise_exc is not None:
233 kwargs.setdefault('raise_exc', self.raise_exc) 235 kwargs.setdefault('raise_exc', self.raise_exc)
234 236
235 kwargs.setdefault('rate_semaphore', self._rate_semaphore)
236
237 return self.session.request(url, method, **kwargs) 237 return self.session.request(url, method, **kwargs)
238 238
239 def get_token(self, auth=None): 239 def get_token(self, auth=None):