From 80b13e9974574541465cb8a7512ab4a61da1c63d Mon Sep 17 00:00:00 2001 From: ishant Date: Mon, 9 Feb 2015 05:07:18 -0800 Subject: [PATCH] Fix heat and ceilometer client connection Heat Ceilometer client plugin uses direclty the Client function of python-ceilometerclient which does not exposes all the parameters required to make a https connection with ceilometer. Instead of this get_client fucntion of ceilometer client should be used which set all the ssl parameters correctly Change-Id: I64029b90b6fdd553b98e4a9e4a749aef6855982a Closes-Bug: #1419772 --- heat/engine/clients/os/ceilometer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/heat/engine/clients/os/ceilometer.py b/heat/engine/clients/os/ceilometer.py index 8743dad284..53d948b09d 100644 --- a/heat/engine/clients/os/ceilometer.py +++ b/heat/engine/clients/os/ceilometer.py @@ -34,13 +34,14 @@ class CeilometerClientPlugin(client_plugin.ClientPlugin): 'project_id': con.tenant, 'token': lambda: self.auth_token, 'endpoint_type': endpoint_type, + 'os_endpoint': endpoint, 'cacert': self._get_client_option('ceilometer', 'ca_file'), 'cert_file': self._get_client_option('ceilometer', 'cert_file'), 'key_file': self._get_client_option('ceilometer', 'key_file'), 'insecure': self._get_client_option('ceilometer', 'insecure') } - return cc.Client('2', endpoint, **args) + return cc.get_client('2', **args) def is_not_found(self, ex): return isinstance(ex, (exc.HTTPNotFound, api_exc.NotFound))