Merge "Remove token_endpoint auth type"

2019-08-29 00:02:31 +00:00
parent fd63a909a8 6fcc2608b1
commit eed615e7d0
8 changed files with 40 additions and 105 deletions
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@ -58,10 +58,10 @@ class OpenStackShell(shell.OpenStackShell):
    def _final_defaults(self):
        super(OpenStackShell, self)._final_defaults()

-        # Set the default plugin to token_endpoint if url and token are given
-        if (self.options.url and self.options.token):
-            # Use service token authentication
-            self._auth_type = 'token_endpoint'
+        # Set the default plugin to admin_token if endpoint and token are given
+        if (self.options.endpoint and self.options.token):
+            # Use token authentication
+            self._auth_type = 'admin_token'
        else:
            self._auth_type = 'password'