Remove token_endpoint auth type
The token_endpoint was a compatibility auth type to maintain support for the --url global option that dated back to the beginning of OpenStack CLI auth. The common keystoneauth library implements 'admin_token' which provides the same functionality using --endpoint rather than --url. Change-Id: I1b9fbb96e447889a41b705324725a2ffc8ecfd9f Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
@ -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'
|
||||
|
||||
|
Reference in New Issue
Block a user