summaryrefslogtreecommitdiff
path: root/openstackclient/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-02 16:19:20 +0000
committerGerrit Code Review <review@openstack.org>2015-03-02 16:19:20 +0000
commitb972937c826f4dfdab0fb7f3a6b1f90e3d90f575 (patch)
treee52c4104f6924dc5f2bad75dae0946af4064e22f /openstackclient/api
parentefffee2370b203df81e6a3ca6c7ce04b6b200d01 (diff)
parent505fa14cd68e13d066a5770a229ba0d7fa88d2a9 (diff)
downloadpython-openstackclient-b972937c826f4dfdab0fb7f3a6b1f90e3d90f575.tar.gz
Merge "Fix auth-required for help command"
Diffstat (limited to 'openstackclient/api')
-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 0ed34e02..2097d716 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