diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-08 13:12:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-08 13:12:41 +0000 |
| commit | 64eb97ace0ecf379e596dc1c526cf89a11e3b437 (patch) | |
| tree | 5cfb911955fa89adbd8b6d8a8ffaedd90551f57c | |
| parent | a23a364e29bd4e7370f37135dccae3f378a3913a (diff) | |
| parent | 929a72e76fe1dd72e8fa28a8e3e1b574a6c19973 (diff) | |
| download | python-glanceclient-64eb97ace0ecf379e596dc1c526cf89a11e3b437.tar.gz | |
Merge "Default to system CA bundle if no CA certificate is provided"
| -rw-r--r-- | glanceclient/common/http.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py index fa46d15..75c125a 100644 --- a/glanceclient/common/http.py +++ b/glanceclient/common/http.py @@ -72,8 +72,9 @@ class HTTPClient(object): if not compression: self.session.mount("https://", https.HTTPSAdapter()) - self.session.verify = (kwargs.get('cacert', None), - kwargs.get('insecure', False)) + self.session.verify = ( + kwargs.get('cacert', requests.certs.where()), + kwargs.get('insecure', False)) else: if kwargs.get('insecure', False) is True: |