summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-05-15 13:07:20 +0000
committerGerrit Code Review <review@openstack.org>2019-05-15 13:07:20 +0000
commit83a2dac21c88b458cfc17e337fe529232f648b7b (patch)
tree1ea32060d539878a1acbb8f5925067c2898b936a
parentbfec0e2083683b70e931cae6c650ce1aaca60489 (diff)
parentd589aa257d3ab99a50444ff42f43b3b9d650d089 (diff)
downloadpython-glanceclient-83a2dac21c88b458cfc17e337fe529232f648b7b.tar.gz
Merge "HTTPClient: actually set a timeout for requests"
-rw-r--r--glanceclient/common/http.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py
index 9ba806f..17d7cc7 100644
--- a/glanceclient/common/http.py
+++ b/glanceclient/common/http.py
@@ -270,6 +270,7 @@ class HTTPClient(_BaseHTTPClient):
conn_url,
data=data,
headers=headers,
+ timeout=self.timeout,
**kwargs)
except requests.exceptions.Timeout as e:
message = ("Error communicating with %(url)s: %(e)s" %