summaryrefslogtreecommitdiff
path: root/ceilometer/energy/kwapi.py
diff options
context:
space:
mode:
Diffstat (limited to 'ceilometer/energy/kwapi.py')
-rw-r--r--ceilometer/energy/kwapi.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ceilometer/energy/kwapi.py b/ceilometer/energy/kwapi.py
index 531f4cb5..4a73d147 100644
--- a/ceilometer/energy/kwapi.py
+++ b/ceilometer/energy/kwapi.py
@@ -52,7 +52,8 @@ class KwapiClient(object):
headers = {}
if self.token is not None:
headers = {'X-Auth-Token': self.token}
- request = requests.get(probes_url, headers=headers)
+ timeout = cfg.CONF.http_timeout
+ request = requests.get(probes_url, headers=headers, timeout=timeout)
message = request.json()
probes = message['probes']
for key, value in six.iteritems(probes):