diff options
| author | Lan Qi song <lqslan@cn.ibm.com> | 2015-05-08 17:40:43 +0800 |
|---|---|---|
| committer | Lan Qi Song <lqslan@cn.ibm.com> | 2015-05-13 01:48:50 +0000 |
| commit | a6d7335ddd7e11401fb6ef2fe8b20be0aef33c44 (patch) | |
| tree | 0c5bc99e2e5462f2a463ca04d2e1ebd91a7b2670 | |
| parent | 127aadfd2b2daf9884ad7003e23440048e2efbd8 (diff) | |
| download | python-ceilometerclient-a6d7335ddd7e11401fb6ef2fe8b20be0aef33c44.tar.gz | |
Fix alarm-evaluator can't start when ssl was enabled
Change-Id: I8cd3f3c7e745107ad4e0cbed7ebdd247a34fbbbd
Closes-Bug: #1453061
(cherry picked from commit ed8408c61f258794a0a689df10c5549753680a0a)
| -rw-r--r-- | ceilometerclient/client.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index 6dd72f5..8e78626 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -257,10 +257,10 @@ def _adjust_kwargs(kwargs): if insecure: verify = False else: - verify = kwargs.get('cacert') or True + verify = client_kwargs.get('cacert') or True - cert = kwargs.get('cert_file') - key = kwargs.get('key_file') + cert = client_kwargs.get('cert_file') + key = client_kwargs.get('key_file') if cert and key: cert = cert, key |