openstack/python-glanceclient
Code Issues Proposed changes

Merge "Default to system CA bundle if no CA certificate is provided"

Browse Source
This commit is contained in:
Jenkins
2014-10-08 13:12:41 +00:00
committed by Gerrit Code Review
parent a23a364e29 929a72e76f
commit 64eb97ace0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
glanceclient/common/http.py
View File

@@ -72,8 +72,9 @@ class HTTPClient(object):
if not compression: if not compression:
self.session.mount("https://", https.HTTPSAdapter()) self.session.mount("https://", https.HTTPSAdapter())
self.session.verify = (kwargs.get('cacert', None), self.session.verify = (
kwargs.get('insecure', False)) kwargs.get('cacert', requests.certs.where()),
kwargs.get('insecure', False))
else: else:
if kwargs.get('insecure', False) is True: if kwargs.get('insecure', False) is True: