Commit 6b0469d2 authored by Iustin Pop's avatar Iustin Pop
Browse files

Fix SshRunner breakage from the changed API

More places actually use the SshRunner than just the gnt-cluster
commands.

Reviewed-by: ultrotter
parent 56bece1f
...@@ -49,7 +49,7 @@ def _GetConfig(): ...@@ -49,7 +49,7 @@ def _GetConfig():
def _GetSshRunner(): def _GetSshRunner():
return ssh.SshRunner(_GetConfig()) return ssh.SshRunner(_GetConfig().GetClusterName())
def _CleanDirectory(path, exclude=[]): def _CleanDirectory(path, exclude=[]):
......
...@@ -264,7 +264,7 @@ def SetupNodeDaemon(node, ssh_key_check): ...@@ -264,7 +264,7 @@ def SetupNodeDaemon(node, ssh_key_check):
""" """
cfg = ssconf.SimpleConfigReader() cfg = ssconf.SimpleConfigReader()
sshrunner = ssh.SshRunner(cfg) sshrunner = ssh.SshRunner(cfg.GetClusterName())
gntpass = utils.GetNodeDaemonPassword() gntpass = utils.GetNodeDaemonPassword()
if not re.match('^[a-zA-Z0-9.]{1,64}$', gntpass): if not re.match('^[a-zA-Z0-9.]{1,64}$', gntpass):
raise errors.OpExecError("ganeti password corruption detected") raise errors.OpExecError("ganeti password corruption detected")
......
...@@ -108,7 +108,7 @@ class LogicalUnit(object): ...@@ -108,7 +108,7 @@ class LogicalUnit(object):
""" """
if not self.__ssh: if not self.__ssh:
self.__ssh = ssh.SshRunner(self.cfg) self.__ssh = ssh.SshRunner(self.cfg.GetClusterName())
return self.__ssh return self.__ssh
ssh = property(fget=__GetSSH) ssh = property(fget=__GetSSH)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment