projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
errors: Document arguments to QueryFilterParseError
[ganeti-local]
/
lib
/
ssh.py
diff --git
a/lib/ssh.py
b/lib/ssh.py
index
cb7aa18
..
4c4a18c
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,14
+31,17
@@
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
+from ganeti import pathutils
+from ganeti import vcluster
def FormatParamikoFingerprint(fingerprint):
def FormatParamikoFingerprint(fingerprint):
- """Formats the fingerprint of L{paramiko.PKey.get_fingerprint()}
+ """Format paramiko PKey fingerprint.
@type fingerprint: str
@param fingerprint: PKey fingerprint
@type fingerprint: str
@param fingerprint: PKey fingerprint
- @return The string hex representation of the fingerprint
+ @return: The string hex representation of the fingerprint
"""
assert len(fingerprint) % 2 == 0
"""
assert len(fingerprint) % 2 == 0
@@
-79,8
+82,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,13
+108,13
@@
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 = [
"-oEscapeChar=none",
"-oHashKnownHosts=no",
"""
options = [
"-oEscapeChar=none",
"-oHashKnownHosts=no",
- "-oGlobalKnownHostsFile=%s" % constants.SSH_KNOWN_HOSTS_FILE,
+ "-oGlobalKnownHostsFile=%s" % pathutils.SSH_KNOWN_HOSTS_FILE,
"-oUserKnownHostsFile=/dev/null",
"-oCheckHostIp=no",
]
"-oUserKnownHostsFile=/dev/null",
"-oCheckHostIp=no",
]
@@
-141,6
+153,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,
@@
-170,7
+185,17
@@
class SshRunner:
quiet=quiet))
if tty:
argv.extend(["-t", "-t"])
quiet=quiet))
if tty:
argv.extend(["-t", "-t"])
- argv.extend(["%s@%s" % (user, hostname), command])
+
+ argv.append("%s@%s" % (user, hostname))
+
+ # Insert variables for virtual nodes
+ argv.extend("export %s=%s;" %
+ (utils.ShellQuote(name), utils.ShellQuote(value))
+ for (name, value) in
+ vcluster.EnvironmentForHost(hostname).items())
+
+ argv.append(command)
+
return argv
def Run(self, *args, **kwargs):
return argv
def Run(self, *args, **kwargs):
@@
-181,8
+206,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
+233,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)
- command.append("%s:%s" % (node, filename))
+ if netutils.IP6Address.IsValid(node):
+ node = netutils.FormatAddress((node, None))
+
+ command.append("%s:%s" % (node, vcluster.ExchangeNodeRoot(node, filename)))
result = utils.RunCmd(command)
if result.failed:
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
+266,12
@@
class SshRunner:
- detail: string with details
"""
- detail: string with details
"""
- retval = self.Run(node, 'root', 'hostname --fqdn')
+ cmd = ("if test -z \"$GANETI_HOSTNAME\"; then"
+ " hostname --fqdn;"
+ "else"
+ " echo \"$GANETI_HOSTNAME\";"
+ "fi")
+ retval = self.Run(node, constants.SSH_LOGIN_USER, cmd, quiet=False)
if retval.failed:
msg = "ssh problem"
if retval.failed:
msg = "ssh problem"