diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-18 13:35:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-18 13:35:53 +0000 |
| commit | 7e1350815e09e0aa669c0ad9d5d3c041ca505b89 (patch) | |
| tree | bef042341a47213df2f71a88bd39ee5b7f31b42d /openstackclient | |
| parent | b2783dc3c44f5843a25770ff749d7a0de18b8dfc (diff) | |
| parent | 46b8cad4c3a5f7a4fb3a08b4ce6fb63fa47ebac3 (diff) | |
| download | python-openstackclient-7e1350815e09e0aa669c0ad9d5d3c041ca505b89.tar.gz | |
Merge "Clean up password prompt work-arounds"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/common/clientmanager.py | 4 | ||||
| -rw-r--r-- | openstackclient/shell.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py index 3e1a50e3..27f3b705 100644 --- a/openstackclient/common/clientmanager.py +++ b/openstackclient/common/clientmanager.py @@ -45,12 +45,12 @@ class ClientManager(clientmanager.ClientManager): self, cli_options=None, api_version=None, + pw_func=None, ): super(ClientManager, self).__init__( cli_options=cli_options, api_version=api_version, - # TODO(dtroyer): Remove this when osc-lib 1.2 is released - pw_func=shell.prompt_for_password, + pw_func=pw_func, ) # TODO(dtroyer): For compatibility; mark this for removal when plugin diff --git a/openstackclient/shell.py b/openstackclient/shell.py index 4ec357cd..8fdf0b61 100644 --- a/openstackclient/shell.py +++ b/openstackclient/shell.py @@ -170,6 +170,7 @@ class OpenStackShell(shell.OpenStackShell): self.client_manager = clientmanager.ClientManager( cli_options=self.cloud, api_version=self.api_version, + pw_func=shell.prompt_for_password, ) def prepare_to_run_command(self, cmd): |