openstack/python-openstackclient
Code Issues Proposed changes

Merge "Clean up password prompt work-arounds"

Browse Source
This commit is contained in:
Jenkins
2017-04-18 13:35:53 +00:00
committed by Gerrit Code Review
parent b2783dc3c4 46b8cad4c3
commit 7e1350815e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/common/clientmanager.py
View File

@@ -45,12 +45,12 @@ class ClientManager(clientmanager.ClientManager):
self, self,
cli_options=None, cli_options=None,
api_version=None, api_version=None,
pw_func=None,
): ):
super(ClientManager, self).__init__( super(ClientManager, self).__init__(
cli_options=cli_options, cli_options=cli_options,
api_version=api_version, api_version=api_version,
# TODO(dtroyer): Remove this when osc-lib 1.2 is released pw_func=pw_func,
pw_func=shell.prompt_for_password,
) )
# TODO(dtroyer): For compatibility; mark this for removal when plugin # TODO(dtroyer): For compatibility; mark this for removal when plugin

1
openstackclient/shell.py
View File

@@ -170,6 +170,7 @@ class OpenStackShell(shell.OpenStackShell):
self.client_manager = clientmanager.ClientManager( self.client_manager = clientmanager.ClientManager(
cli_options=self.cloud, cli_options=self.cloud,
api_version=self.api_version, api_version=self.api_version,
pw_func=shell.prompt_for_password,
) )
def prepare_to_run_command(self, cmd): def prepare_to_run_command(self, cmd):