Use AUTH_INTERFACE object from keystoneauth

As keystoneclient and other services rely more on keystoneauth we should
assume that keystoneauth is our base auth library, not keystoneclient
and start to default to the objects provided from there. This will make
it easier to remove these objects when the time comes.

Use the AUTH_INTERFACE special object from keystoneauth in most places.
This uses it everywhere that is actually session independant. For
example it is not changed within the keystoneclient auth plugins
themselves as they are directly compatible with keystoneauth.

Change-Id: Ibc1224fca98c852106feb78c624b0b2f22b3a19d

1 files changed, 2 insertions, 2 deletions

diff --git a/keystoneclient/discover.py b/keystoneclient/discover.py
index d316fdc..85b0875 100644
--- a/keystoneclient/discover.py
+++ b/keystoneclient/discover.py
@@ -14,11 +14,11 @@ import logging
 import warnings
 
 from debtcollector import removals
+from keystoneauth1 import plugin
 from positional import positional
 import six
 
 from keystoneclient import _discover
-from keystoneclient.auth import base
 from keystoneclient import exceptions
 from keystoneclient.i18n import _
 from keystoneclient import session as client_session
@@ -173,7 +173,7 @@ class Discover(_discover.Discover):
             url = auth_url
         elif session.auth:
             self._use_endpoint = False
-            url = session.get_endpoint(interface=base.AUTH_INTERFACE)
+            url = session.get_endpoint(interface=plugin.AUTH_INTERFACE)
 
         if not url:
             raise exceptions.DiscoveryFailure(