openstack/aodh
Code Issues Proposed changes

Merge "Ensure insecure config option propagated by alarm evaluator"

Browse Source
This commit is contained in:
Jenkins 2014-03-19 17:42:06 +00:00 committed by Gerrit Code Review
commit 174e907adc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,7 @@ class Evaluator(object):
os_username=auth_config.os_username,
os_cacert=auth_config.os_cacert,
os_endpoint_type=auth_config.os_endpoint_type,
insecure=auth_config.insecure,
)
self.api_client = ceiloclient.get_client(2, **creds)
return self.api_client

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

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