diff options
| author | Itisha Dewan <ishadewan07@gmail.com> | 2016-06-14 06:57:02 +0400 |
|---|---|---|
| committer | Steve Martinelli <s.martinelli@gmail.com> | 2016-09-03 03:22:04 +0000 |
| commit | a9115b4cd8dd18f74286e7047d1d4196d17ce1b7 (patch) | |
| tree | 56668bc2fc1e80d86e6a3742c6d0be3ee2d8cbae /glanceclient/common | |
| parent | fec9b5f5e30276df52318090a6d26a4c6ffe18f9 (diff) | |
| download | python-glanceclient-a9115b4cd8dd18f74286e7047d1d4196d17ce1b7.tar.gz | |
switch from keystoneclient to keystoneauth
move glanceclient to keystoneauth as keystoneclient's auth session,
plugins and adapter code has been deprecated.
refer to [1] for more information.
1: https://github.com/openstack/python-keystoneclient/commit/1a84e24fa4ce6d3169b59e385f35b2a63f2257f0
implements bp: use-keystoneauth
Co-Authored-By: Itisha <ishadewan07@gmail.com>
Change-Id: I88fb327628e1bec48dc391f50d66b3deab4a8ab9
Diffstat (limited to 'glanceclient/common')
| -rw-r--r-- | glanceclient/common/http.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py index 352ba10..dbca142 100644 --- a/glanceclient/common/http.py +++ b/glanceclient/common/http.py @@ -17,8 +17,8 @@ import copy import logging import socket -from keystoneclient import adapter -from keystoneclient import exceptions as ksc_exc +from keystoneauth1 import adapter +from keystoneauth1 import exceptions as ksa_exc from oslo_utils import importutils from oslo_utils import netutils import requests @@ -329,13 +329,13 @@ class SessionClient(adapter.Adapter, _BaseHTTPClient): headers=headers, data=data, **kwargs) - except ksc_exc.RequestTimeout as e: + except ksa_exc.ConnectTimeout as e: conn_url = self.get_endpoint(auth=kwargs.get('auth')) conn_url = "%s/%s" % (conn_url.rstrip('/'), url.lstrip('/')) message = ("Error communicating with %(url)s %(e)s" % dict(url=conn_url, e=e)) raise exc.InvalidEndpoint(message=message) - except ksc_exc.ConnectionRefused as e: + except ksa_exc.ConnectFailure as e: conn_url = self.get_endpoint(auth=kwargs.get('auth')) conn_url = "%s/%s" % (conn_url.rstrip('/'), url.lstrip('/')) message = ("Error finding address for %(url)s: %(e)s" % |