openstack
/
ceilometer
Code Issues Proposed changes

Ensure insecure config option propagated by alarm service 

Fixes bug 1292130

Ensure insecure (i.e. non-cert-verifying) access over SSL to
keystone works from the alarm evaluator

Change-Id: Ice009ad97ea540afede697e9d812f1bde877dd84
This commit is contained in:
Eoghan Glynn 2014-03-13 17:53:34 +00:00
parent 2e150c57db
commit b2be83ed1f
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/service.py
View File

@ -86,6 +86,7 @@ class AlarmService(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/test_singleton_alarm_svc.py
View File

@ -101,6 +101,7 @@ class TestSingletonAlarmService(test.BaseTestCase):
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)