summaryrefslogtreecommitdiff
path: root/openstackclient/api/auth.py
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2015-02-27 09:19:12 -0600
committerDean Troyer <dtroyer@gmail.com>2015-02-27 17:27:17 -0600
commit505fa14cd68e13d066a5770a229ba0d7fa88d2a9 (patch)
tree2b7deecebfc03ca94a89536127a206ef658fc2a3 /openstackclient/api/auth.py
parent9400effd4b7653045657630e0909b3dc303ec59e (diff)
downloadpython-openstackclient-505fa14cd68e13d066a5770a229ba0d7fa88d2a9.tar.gz
Fix auth-required for help command
When we got picky with the auth arguments we broke using help without any auth config supplied. This rearranges things a bit to do the argument checking when the deferred auth request to Identity occurs so commands that do not need auth have a chance to live short but useful lives. Closes-Bug: #1399588 Change-Id: I8ceac491cf65e25eddb62ab2713f471fe686756d
Diffstat (limited to 'openstackclient/api/auth.py')
-rw-r--r--openstackclient/api/auth.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/openstackclient/api/auth.py b/openstackclient/api/auth.py
index 14bb01d7..d44f2f9d 100644
--- a/openstackclient/api/auth.py
+++ b/openstackclient/api/auth.py
@@ -85,9 +85,9 @@ def select_auth_plugin(options):
# let keystoneclient figure it out itself
auth_plugin_name = 'token'
else:
- raise exc.CommandError(
- "Authentication type must be selected with --os-auth-type"
- )
+ # The ultimate default is similar to the original behaviour,
+ # but this time with version discovery
+ auth_plugin_name = 'osc_password'
LOG.debug("Auth plugin %s selected" % auth_plugin_name)
return auth_plugin_name