summaryrefslogtreecommitdiff
path: root/ceilometer/image
diff options
context:
space:
mode:
Diffstat (limited to 'ceilometer/image')
-rw-r--r--ceilometer/image/glance.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py
index 76292e77..6225d216 100644
--- a/ceilometer/image/glance.py
+++ b/ceilometer/image/glance.py
@@ -62,7 +62,8 @@ class _Base(plugin.CentralPollster):
return glanceclient.Client('1', endpoint,
token=ksclient.auth_token,
cacert=service_credentials.os_cacert,
- insecure=service_credentials.insecure)
+ insecure=service_credentials.insecure,
+ timeout=cfg.CONF.http_timeout)
def _get_images(self, ksclient, endpoint):
client = self.get_glance_client(ksclient, endpoint)