diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-29 20:39:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-29 20:39:37 +0000 |
| commit | 471276568908e237083c848222d3101e7b64908e (patch) | |
| tree | 1b7a98e52a411e948432f328e797b3cd984e7b00 /glanceclient/common/https.py | |
| parent | ec0f2dfd8500d230895e286462aaf69c43777038 (diff) | |
| parent | c41dcc9f4366429d952cc47853496d58d47b7511 (diff) | |
| download | python-glanceclient-471276568908e237083c848222d3101e7b64908e.tar.gz | |
Merge "Fix failure to create glance https connection pool"
Diffstat (limited to 'glanceclient/common/https.py')
| -rw-r--r-- | glanceclient/common/https.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/glanceclient/common/https.py b/glanceclient/common/https.py index 79f6d6d..a0120bc 100644 --- a/glanceclient/common/https.py +++ b/glanceclient/common/https.py @@ -160,15 +160,16 @@ class HTTPSAdapter(adapters.HTTPAdapter): return url def _create_glance_httpsconnectionpool(self, url): - kw = self.poolmanager.connection_kw + kw = self.poolmanager.connection_pool_kw # Parse the url to get the scheme, host, and port parsed = compat.urlparse(url) # If there is no port specified, we should use the standard HTTPS port port = parsed.port or 443 - pool = HTTPSConnectionPool(parsed.host, port, **kw) + host = parsed.netloc.rsplit(':', 1)[0] + pool = HTTPSConnectionPool(host, port, **kw) with self.poolmanager.pools.lock: - self.poolmanager.pools[(parsed.scheme, parsed.host, port)] = pool + self.poolmanager.pools[(parsed.scheme, host, port)] = pool return pool |