Merge "Clean up password prompt work-arounds"
This commit is contained in:
commit
7e1350815e
|
@ -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
|
||||||
|
|
|
@ -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):
|
||||||
|
|
Loading…
Reference in New Issue