summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLan Qi song <lqslan@cn.ibm.com>2015-05-08 17:40:43 +0800
committerLan Qi song <lqslan@cn.ibm.com>2015-05-11 15:54:49 +0800
commited8408c61f258794a0a689df10c5549753680a0a (patch)
treeb1d703a6309a32eb0a838ff80a95d442e9066cc3
parentfe20f3c29ea84bf7a9a5fb96f92d01c65d8c9e5f (diff)
downloadpython-ceilometerclient-ed8408c61f258794a0a689df10c5549753680a0a.tar.gz
Fix alarm-evaluator can't start when ssl was enabled
Change-Id: I8cd3f3c7e745107ad4e0cbed7ebdd247a34fbbbd Closes-Bug: #1453061
-rw-r--r--ceilometerclient/client.py6
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