openstack
/
ceilometer
Code Issues Proposed changes

cacert is not picked up correctly by alarm services 

related to bug 1266472 which changes client to look only at os_cacert arg.
update alarm services to use just os_cacert as well.

Change-Id: Id28a0838330296fe030fa7c4a35a216dd3e64bad
Closes-Bug: #1266477
(cherry picked from commit 89f9b3049a)
This commit is contained in:
Eoghan Glynn 2014-02-14 09:06:25 +00:00
parent 0a85f225f7
commit ff0375c693
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/alarm/evaluator/__init__.py
View File

@ -53,7 +53,7 @@ class Evaluator(object):
os_tenant_name=auth_config.os_tenant_name,
os_password=auth_config.os_password,
os_username=auth_config.os_username,
cacert=auth_config.os_cacert,
os_cacert=auth_config.os_cacert,
endpoint_type=auth_config.os_endpoint_type,
)
self.api_client = ceiloclient.get_client(2, **creds)

2
ceilometer/alarm/service.py
View File

@ -84,7 +84,7 @@ class AlarmService(object):
os_tenant_name=auth_config.os_tenant_name,
os_password=auth_config.os_password,
os_username=auth_config.os_username,
cacert=auth_config.os_cacert,
os_cacert=auth_config.os_cacert,
endpoint_type=auth_config.os_endpoint_type,
)
self.api_client = ceiloclient.get_client(2, **creds)