From a6d7335ddd7e11401fb6ef2fe8b20be0aef33c44 Mon Sep 17 00:00:00 2001 From: Lan Qi song Date: Fri, 8 May 2015 17:40:43 +0800 Subject: [PATCH] Fix alarm-evaluator can't start when ssl was enabled Change-Id: I8cd3f3c7e745107ad4e0cbed7ebdd247a34fbbbd Closes-Bug: #1453061 (cherry picked from commit ed8408c61f258794a0a689df10c5549753680a0a) --- ceilometerclient/client.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index 6dd72f5d..8e786261 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