From b047857b053ccbe79a63957220c55ed8d6c4c31a Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 18 Mar 2008 13:03:40 +0000
Subject: [PATCH] =?UTF-8?q?Use=20new=20=E2=80=9Ctty=E2=80=9D=20parameter?=
=?UTF-8?q?=20on=20SshRunner.BuildCmd=20for=20=E2=80=9Cgnt-instance=20cons?=
=?UTF-8?q?ole=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reviewed-by: ultrotter
---
lib/cmdlib.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 62710f1bd..cb2a5bcd4 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3261,13 +3261,10 @@ class LUConnectConsole(NoHooksLU):
hyper = hypervisor.GetHypervisor()
console_cmd = hyper.GetShellCommandForConsole(instance)
+
# build ssh cmdline
- argv = ["ssh", "-q", "-t"]
- argv.extend(ssh.KNOWN_HOSTS_OPTS)
- argv.extend(ssh.BATCH_MODE_OPTS)
- argv.append(node)
- argv.append(console_cmd)
- return "ssh", argv
+ cmd = self.ssh.BuildCmd(node, "root", console_cmd, batch=True, tty=True)
+ return cmd[0], cmd
class LUAddMDDRBDComponent(LogicalUnit):
--
GitLab