Merge "Don't replace the https handler in the poolmanager"

2014-11-05 19:06:11 +00:00
parent cfe0623520 052904ba32
commit 695dbc910d
3 changed files with 27 additions and 4 deletions
@@ -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()),