projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hypervisor: allow ballooning of instance memory
[ganeti-local]
/
lib
/
ssh.py
diff --git
a/lib/ssh.py
b/lib/ssh.py
index
8daf579
..
5c11be2
100644
(file)
--- a/
lib/ssh.py
+++ b/
lib/ssh.py
@@
-1,7
+1,7
@@
#
#
#
#
-# Copyright (C) 2006, 2007 Google Inc.
+# Copyright (C) 2006, 2007, 2010, 2011 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-31,6
+31,7
@@
import re
from ganeti import utils
from ganeti import errors
from ganeti import constants
from ganeti import utils
from ganeti import errors
from ganeti import constants
+from ganeti import netutils
def FormatParamikoFingerprint(fingerprint):
def FormatParamikoFingerprint(fingerprint):
@@
-79,8
+80,17
@@
class SshRunner:
"""Wrapper for SSH commands.
"""
"""Wrapper for SSH commands.
"""
- def __init__(self, cluster_name):
+ def __init__(self, cluster_name, ipv6=False):
+ """Initializes this class.
+
+ @type cluster_name: str
+ @param cluster_name: name of the cluster
+ @type ipv6: bool
+ @param ipv6: If true, force ssh to use IPv6 addresses only
+
+ """
self.cluster_name = cluster_name
self.cluster_name = cluster_name
+ self.ipv6 = ipv6
def _BuildSshOptions(self, batch, ask_key, use_cluster_key,
strict_host_check, private_key=None, quiet=True):
def _BuildSshOptions(self, batch, ask_key, use_cluster_key,
strict_host_check, private_key=None, quiet=True):
@@
-96,7
+106,7
@@
class SshRunner:
@param quiet: whether to enable -q to ssh
@rtype: list
@param quiet: whether to enable -q to ssh
@rtype: list
- @return: the list of options ready to use in L{utils.RunCmd}
+ @return: the list of options ready to use in L{utils.process.RunCmd}
"""
options = [
"""
options = [
@@
-141,6
+151,9
@@
class SshRunner:
else:
options.append("-oStrictHostKeyChecking=no")
else:
options.append("-oStrictHostKeyChecking=no")
+ if self.ipv6:
+ options.append("-6")
+
return options
def BuildCmd(self, hostname, user, command, batch=True, ask_key=False,
return options
def BuildCmd(self, hostname, user, command, batch=True, ask_key=False,
@@
-181,8
+194,8
@@
class SshRunner:
Args: see SshRunner.BuildCmd.
Args: see SshRunner.BuildCmd.
- @rtype: L{utils.RunResult}
- @return: the result as from L{utils.RunCmd()}
+ @rtype: L{utils.process.RunResult}
+ @return: the result as from L{utils.process.RunCmd()}
"""
return utils.RunCmd(self.BuildCmd(*args, **kwargs))
"""
return utils.RunCmd(self.BuildCmd(*args, **kwargs))
@@
-208,13
+221,16
@@
class SshRunner:
command = [constants.SCP, "-p"]
command.extend(self._BuildSshOptions(True, False, True, True))
command.append(filename)
command = [constants.SCP, "-p"]
command.extend(self._BuildSshOptions(True, False, True, True))
command.append(filename)
+ if netutils.IP6Address.IsValid(node):
+ node = netutils.FormatAddress((node, None))
+
command.append("%s:%s" % (node, filename))
result = utils.RunCmd(command)
if result.failed:
command.append("%s:%s" % (node, filename))
result = utils.RunCmd(command)
if result.failed:
- logging.error("Copy to node %s failed (%s) error %s,"
- " command was %s",
+ logging.error("Copy to node %s failed (%s) error '%s',"
+ " command was '%s'",
node, result.fail_reason, result.output, result.cmd)
return not result.failed
node, result.fail_reason, result.output, result.cmd)
return not result.failed
@@
-238,7
+254,7
@@
class SshRunner:
- detail: string with details
"""
- detail: string with details
"""
- retval = self.Run(node, 'root', 'hostname --fqdn')
+ retval = self.Run(node, "root", "hostname --fqdn", quiet=False)
if retval.failed:
msg = "ssh problem"
if retval.failed:
msg = "ssh problem"