diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2014-08-26 18:12:19 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2014-09-02 20:43:47 -0400 |
| commit | 929a72e76fe1dd72e8fa28a8e3e1b574a6c19973 (patch) | |
| tree | 8f3327359c6a4141898c1fb53cca3513d898cb27 | |
| parent | 16077d91ddfeebe77a3c6d7fedc7125ddff17bdb (diff) | |
| download | python-glanceclient-929a72e76fe1dd72e8fa28a8e3e1b574a6c19973.tar.gz | |
Default to system CA bundle if no CA certificate is provided
If no CA certificate is provided to be used for validation then
fall back to the system-wide CA bundle as presented by
python-requests.
Change-Id: I05206a868150d4b62b6f1b833310eb9b86b7c4f8
Closes-bug: #1362179
| -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 8c7937a..092bf5c 100644 --- a/glanceclient/common/http.py +++ b/glanceclient/common/http.py @@ -71,8 +71,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: |