From 6b0469d21995ce4e9864289e95f4d2b494829d54 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Mon, 6 Oct 2008 13:16:23 +0000
Subject: [PATCH] Fix SshRunner breakage from the changed API
More places actually use the SshRunner than just the gnt-cluster
commands.
Reviewed-by: ultrotter
---
lib/backend.py | 2 +-
lib/bootstrap.py | 2 +-
lib/cmdlib.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/backend.py b/lib/backend.py
index 5c8227c9c..474fc815a 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -49,7 +49,7 @@ def _GetConfig():
def _GetSshRunner():
- return ssh.SshRunner(_GetConfig())
+ return ssh.SshRunner(_GetConfig().GetClusterName())
def _CleanDirectory(path, exclude=[]):
diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index 43a7f4f40..2dfb1fa74 100644
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -264,7 +264,7 @@ def SetupNodeDaemon(node, ssh_key_check):
"""
cfg = ssconf.SimpleConfigReader()
- sshrunner = ssh.SshRunner(cfg)
+ sshrunner = ssh.SshRunner(cfg.GetClusterName())
gntpass = utils.GetNodeDaemonPassword()
if not re.match('^[a-zA-Z0-9.]{1,64}$', gntpass):
raise errors.OpExecError("ganeti password corruption detected")
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 038f5a27a..a91ca23d1 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -108,7 +108,7 @@ class LogicalUnit(object):
"""
if not self.__ssh:
- self.__ssh = ssh.SshRunner(self.cfg)
+ self.__ssh = ssh.SshRunner(self.cfg.GetClusterName())
return self.__ssh
ssh = property(fget=__GetSSH)
--
GitLab