diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-05 19:06:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-05 19:06:11 +0000 |
| commit | 695dbc910d2068aff89a68d6f5aa088cc835766e (patch) | |
| tree | 61a23fa5eee4ca0bebf213b763828658dd6610c5 /glanceclient/common/http.py | |
| parent | cfe06235207d50d6d36b3d8b3e87608412038c80 (diff) | |
| parent | 052904ba32f6e6075b023065bff684042c640c6a (diff) | |
| download | python-glanceclient-695dbc910d2068aff89a68d6f5aa088cc835766e.tar.gz | |
Merge "Don't replace the https handler in the poolmanager"0.14.2
Diffstat (limited to 'glanceclient/common/http.py')
| -rw-r--r-- | glanceclient/common/http.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py index ad9da20..028946d 100644 --- a/glanceclient/common/http.py +++ b/glanceclient/common/http.py @@ -70,7 +70,8 @@ class HTTPClient(object): compression = kwargs.get('ssl_compression', True) if not compression: - self.session.mount("https://", https.HTTPSAdapter()) + self.session.mount("glance+https://", https.HTTPSAdapter()) + self.endpoint = 'glance+' + self.endpoint self.session.verify = ( kwargs.get('cacert', requests.certs.where()), |