openstack
/
python-openstackclient
Code Issues Proposed changes

Merge "Restore default auth-type for token/endpoint"

This commit is contained in:
Jenkins 2016-08-25 21:07:03 +00:00 committed by Gerrit Code Review
parent 2774145e44 188709c668
commit a08b62523f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstackclient/shell.py
View File

@ -61,8 +61,12 @@ class OpenStackShell(shell.OpenStackShell):
def _final_defaults(self):
super(OpenStackShell, self)._final_defaults()
# Set default auth type to password
self._auth_type = 'password'
# 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'
else:
self._auth_type = 'password'
def _load_plugins(self):
"""Load plugins via stevedore