diff options
Diffstat (limited to 'ceilometerclient/client.py')
| -rw-r--r-- | ceilometerclient/client.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index 451c7c0..0330036 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -13,12 +13,12 @@ import contextlib import time -from keystoneclient import adapter -from keystoneclient.auth.identity import v2 as v2_auth -from keystoneclient.auth.identity import v3 as v3_auth -from keystoneclient import discover -from keystoneclient import exceptions as ks_exc -from keystoneclient import session +from keystoneauth1 import adapter +from keystoneauth1 import discover +from keystoneauth1 import exceptions as ka_exc +from keystoneauth1.identity import v2 as v2_auth +from keystoneauth1.identity import v3 as v3_auth +from keystoneauth1 import session from oslo_utils import strutils import six.moves.urllib.parse as urlparse @@ -35,10 +35,10 @@ def _discover_auth_versions(session, auth_url): v2_auth_url = None v3_auth_url = None try: - ks_discover = discover.Discover(session=session, auth_url=auth_url) + ks_discover = discover.Discover(session=session, url=auth_url) v2_auth_url = ks_discover.url_for('2.0') v3_auth_url = ks_discover.url_for('3.0') - except ks_exc.DiscoveryFailure: + except ka_exc.DiscoveryFailure: raise except exceptions.ClientException: # Identity service may not support discovery. In that case, |