diff options
| author | Eoghan Glynn <eglynn@redhat.com> | 2014-02-11 17:02:55 +0000 |
|---|---|---|
| committer | Eoghan Glynn <eglynn@redhat.com> | 2014-02-13 17:16:43 +0000 |
| commit | 0ac6942959d52f20a3955c982974d5f15aabcab5 (patch) | |
| tree | 7594343522213ebe6e1382c1c894b21880c026d3 | |
| parent | 9149861ea1b2a2abc200e79ab23d5e1fca5af752 (diff) | |
| download | ceilometer-0ac6942959d52f20a3955c982974d5f15aabcab5.tar.gz | |
Propogate cacert and insecure flags to glanceclient
Fixes bug 1278973
Previously, the insecure flag was only propagated to the keystoneclient
while the cacert flag was only propagated to the keystoneclient and
the ceilometerclient used by alarming.
Since the glanceclient also supports these options, these flags should
be propogated to it also to avoid SSL cert verification failures when the
central agent calls out to glance over https.
Change-Id: I967ba080a4011a54b5789ca0fc20cb9a37dafb15
(cherry picked from commit b000317f670f635b00ca52a4539a0b83b14c8ff4)
| -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) |