summaryrefslogtreecommitdiff
path: root/glanceclient/common/http.py
diff options
context:
space:
mode:
Diffstat (limited to 'glanceclient/common/http.py')
-rw-r--r--glanceclient/common/http.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py
index 874f2f4..a078436 100644
--- a/glanceclient/common/http.py
+++ b/glanceclient/common/http.py
@@ -67,8 +67,16 @@ class HTTPClient(object):
if not compression:
self.session.mount("https://", https.HTTPSAdapter())
- self.session.verify = kwargs.get('cacert',
- not kwargs.get('insecure', True))
+ self.session.verify = (kwargs.get('cacert', None),
+ kwargs.get('insecure', False))
+
+ else:
+ if kwargs.get('insecure', False) is True:
+ self.session.verify = False
+ else:
+ if kwargs.get('cacert', None) is not '':
+ self.session.verify = kwargs.get('cacert', True)
+
self.session.cert = (kwargs.get('cert_file'),
kwargs.get('key_file'))