diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-29 18:45:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-29 18:45:02 +0000 |
| commit | dbb8ca35fc2a9ab1c3aa3b77e83c947abf3c6f26 (patch) | |
| tree | 803b1ad715a77a723974ff63828b3311b02e1b8a /ceilometer/image | |
| parent | 1a30a0fccb922a7759c8a5d44399e8209c404605 (diff) | |
| parent | 2c0dd5d079a72352b8ee2fe58a77a8380d04c955 (diff) | |
| download | ceilometer-dbb8ca35fc2a9ab1c3aa3b77e83c947abf3c6f26.tar.gz | |
Merge "Use configured endpoint_type everywhere"
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 8cf48648..2e257e36 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 sample 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, |