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
This commit is contained in:
Gordon Chung 2014-01-06 09:31:37 -05:00
parent d6639d849f
commit 89f9b3049a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,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,
os_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,
os_endpoint_type=auth_config.os_endpoint_type,
)
self.api_client = ceiloclient.get_client(2, **creds)

2
ceilometer/tests/alarm/evaluator/test_threshold.py
View File

@ -307,7 +307,7 @@ class TestEvaluate(base.TestEvaluatorBase):
os_tenant_name=conf.os_tenant_name,
os_password=conf.os_password,
os_username=conf.os_username,
cacert=conf.os_cacert,
os_cacert=conf.os_cacert,
os_endpoint_type=conf.os_endpoint_type)]
actual = client.call_args_list
self.assertEqual(actual, expected)

2
ceilometer/tests/alarm/test_singleton_alarm_svc.py
View File

@ -100,7 +100,7 @@ class TestSingletonAlarmService(test.BaseTestCase):
os_tenant_name=conf.os_tenant_name,
os_password=conf.os_password,
os_username=conf.os_username,
cacert=conf.os_cacert,
os_cacert=conf.os_cacert,
os_endpoint_type=conf.os_endpoint_type)]
actual = client.call_args_list
self.assertEqual(actual, expected)