diff options
author | Julien Danjou <julien@danjou.info> | 2013-07-24 12:49:11 +0200 |
---|---|---|
committer | Julien Danjou <julien@danjou.info> | 2013-07-25 16:00:25 +0200 |
commit | 2c0dd5d079a72352b8ee2fe58a77a8380d04c955 (patch) | |
tree | d5416250d3176c9b4be43e915bc0e987a880f16f /ceilometer/image | |
parent | a4b1b54a48e86d4a6a1b6bd48c5caab52cdcc04a (diff) | |
download | ceilometer-2c0dd5d079a72352b8ee2fe58a77a8380d04c955.tar.gz |
Use configured endpoint_type everywhere
It seems there has been some usage forgotten in pollsters.
Change-Id: I19c3b05377d484a7c50cd4534f26405ea67f1232
Diffstat (limited to 'ceilometer/image')
-rw-r--r-- | ceilometer/image/glance.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py index 19f47ef8..4541b961 100644 --- a/ceilometer/image/glance.py +++ b/ceilometer/image/glance.py @@ -22,6 +22,7 @@ from __future__ import absolute_import import itertools import glanceclient +from oslo.config import cfg from ceilometer import counter from ceilometer.openstack.common import timeutils @@ -34,7 +35,7 @@ class _Base(plugin.PollsterBase): def get_glance_client(ksclient): endpoint = ksclient.service_catalog.url_for( service_type='image', - endpoint_type='internalURL') + endpoint_type=cfg.CONF.service_credentials.os_endpoint_type) # hard-code v1 glance API version selection while v2 API matures return glanceclient.Client('1', endpoint, |