summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-18 13:35:53 +0000
committerGerrit Code Review <review@openstack.org>2017-04-18 13:35:53 +0000
commit7e1350815e09e0aa669c0ad9d5d3c041ca505b89 (patch)
treebef042341a47213df2f71a88bd39ee5b7f31b42d /openstackclient/common
parentb2783dc3c44f5843a25770ff749d7a0de18b8dfc (diff)
parent46b8cad4c3a5f7a4fb3a08b4ce6fb63fa47ebac3 (diff)
downloadpython-openstackclient-7e1350815e09e0aa669c0ad9d5d3c041ca505b89.tar.gz
Merge "Clean up password prompt work-arounds"
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/clientmanager.py4
1 files changed, 2 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