diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-02 16:19:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-02 16:19:20 +0000 |
| commit | b972937c826f4dfdab0fb7f3a6b1f90e3d90f575 (patch) | |
| tree | e52c4104f6924dc5f2bad75dae0946af4064e22f /openstackclient/shell.py | |
| parent | efffee2370b203df81e6a3ca6c7ce04b6b200d01 (diff) | |
| parent | 505fa14cd68e13d066a5770a229ba0d7fa88d2a9 (diff) | |
| download | python-openstackclient-b972937c826f4dfdab0fb7f3a6b1f90e3d90f575.tar.gz | |
Merge "Fix auth-required for help command"
Diffstat (limited to 'openstackclient/shell.py')
| -rw-r--r-- | openstackclient/shell.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/openstackclient/shell.py b/openstackclient/shell.py index 246f51b1..b61da2b9 100644 --- a/openstackclient/shell.py +++ b/openstackclient/shell.py @@ -22,7 +22,6 @@ import traceback from cliff import app from cliff import command -from cliff import complete from cliff import help import openstackclient @@ -70,10 +69,9 @@ class OpenStackShell(app.App): def __init__(self): # Patch command.Command to add a default auth_required = True command.Command.auth_required = True - command.Command.best_effort = False - # But not help + + # Some commands do not need authentication help.HelpCommand.auth_required = False - complete.CompleteCommand.best_effort = True super(OpenStackShell, self).__init__( description=__doc__.strip(), @@ -294,7 +292,7 @@ class OpenStackShell(app.App): self.verify = not self.options.insecure self.client_manager = clientmanager.ClientManager( - auth_options=self.options, + cli_options=self.options, verify=self.verify, api_version=self.api_version, pw_func=prompt_for_password, @@ -308,7 +306,7 @@ class OpenStackShell(app.App): cmd.__class__.__module__, cmd.__class__.__name__, ) - if cmd.auth_required and cmd.best_effort: + if cmd.auth_required: try: # Trigger the Identity client to initialize self.client_manager.auth_ref |