From 46b8cad4c3a5f7a4fb3a08b4ce6fb63fa47ebac3 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 1 Feb 2017 16:40:04 -0600
Subject: [PATCH] Clean up password prompt work-arounds

osc-lib 1.2 is minimum and now handles the password prompting.

Change-Id: Ie11ad64796d3a89c7396b321c34947d622d1ed39
---
 openstackclient/common/clientmanager.py | 4 ++--
 openstackclient/shell.py                | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 3e1a50e3e6..27f3b70552 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 4ec357cde0..8fdf0b61f2 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):