diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-06 23:07:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-06 23:07:25 +0000 |
| commit | 41a26ea2ab2afe4617443c6fd32452437394c27f (patch) | |
| tree | 5fca2b0ab5d3d00faa72de6973d53c9ca647e96a | |
| parent | 132d9f9634d8eb3564b11d0ac8a73eef02cfa43c (diff) | |
| parent | 0ac6942959d52f20a3955c982974d5f15aabcab5 (diff) | |
| download | ceilometer-41a26ea2ab2afe4617443c6fd32452437394c27f.tar.gz | |
Merge "Propogate cacert and insecure flags to glanceclient" into stable/havana
| -rw-r--r-- | ceilometer/image/glance.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py index 132e5230..7a85b478 100644 --- a/ceilometer/image/glance.py +++ b/ceilometer/image/glance.py @@ -38,8 +38,11 @@ class _Base(plugin.PollsterBase): endpoint_type=cfg.CONF.service_credentials.os_endpoint_type) # hard-code v1 glance API version selection while v2 API matures + service_credentials = cfg.CONF.service_credentials return glanceclient.Client('1', endpoint, - token=ksclient.auth_token) + token=ksclient.auth_token, + cacert=service_credentials.os_cacert, + insecure=service_credentials.insecure) def _get_images(self, ksclient): client = self.get_glance_client(ksclient) |