Revert "Use TokenManager to get token"

This reverts commit 22228f526d6ea08b7006be1287afe959b93c23db which appears to be breaking the keystone gating

1 files changed, 9 insertions, 2 deletions

diff --git a/keystoneclient/v2_0/tokens.py b/keystoneclient/v2_0/tokens.py
index 1eb0f5d..c129db7 100644
--- a/keystoneclient/v2_0/tokens.py
+++ b/keystoneclient/v2_0/tokens.py
@@ -34,8 +34,15 @@ class TokenManager(base.ManagerWithFind):
             params['auth']['tenantId'] = tenant_id
         elif tenant_name:
             params['auth']['tenantName'] = tenant_name
-        return self._create('/tokens', params, "access",
-                            return_raw=return_raw, management=False)
+        reset = 0
+        if self.api.management_url is None:
+            reset = 1
+            self.api.management_url = self.api.auth_url
+        token_ref = self._create('/tokens', params, "access",
+                                 return_raw=return_raw)
+        if reset:
+            self.api.management_url = None
+        return token_ref
 
     def delete(self, token):
         return self._delete("/tokens/%s" % base.getid(token))