From 505fa14cd68e13d066a5770a229ba0d7fa88d2a9 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Fri, 27 Feb 2015 09:19:12 -0600 Subject: 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 --- openstackclient/api/auth.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'openstackclient/api/auth.py') 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 -- cgit v1.2.1