switch to keystoneauth

move heatclient to keystoneauth as keystoneclient's auth session,
plugins and adapter code has been deprecated [1].

[1] http://docs.openstack.org/releasenotes/python-keystoneclient/mitaka.html#deprecation-notes

Change-Id: Iedd7ceb97d39ab3ecccf8786aad8b5f45d15175e

1 files changed, 6 insertions, 7 deletions

diff --git a/heatclient/shell.py b/heatclient/shell.py
index 5f13b0f..f71d8d7 100644
--- a/heatclient/shell.py
+++ b/heatclient/shell.py
@@ -20,17 +20,16 @@ import argparse
 import logging
 import sys
 
+from keystoneauth1 import discover
+from keystoneauth1 import exceptions as ks_exc
+from keystoneauth1.identity import v2 as v2_auth
+from keystoneauth1.identity import v3 as v3_auth
+from keystoneauth1 import session as kssession
 from oslo_utils import encodeutils
 from oslo_utils import importutils
 import six
 import six.moves.urllib.parse as urlparse
 
-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 as kssession
-
 import heatclient
 from heatclient import client as heat_client
 from heatclient.common import utils
@@ -409,7 +408,7 @@ class HeatShell(object):
         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.ClientException: