diff options
| author | mbligh <mbligh@592f7852-d20e-0410-864c-8624ca9c26a4> | 2010-01-15 18:15:58 +0000 |
|---|---|---|
| committer | mbligh <mbligh@592f7852-d20e-0410-864c-8624ca9c26a4> | 2010-01-15 18:15:58 +0000 |
| commit | 6064f29aa0cdafccc008aba7eecb11795e259f2d (patch) | |
| tree | 3e93ab8ad5a35384f68b226193bffda8c23cb9e6 | |
| parent | f8d915d2afac89985a6cd9213bf96a0e95a89a00 (diff) | |
Add -o UserKnownHostsFile=/dev/null -o BatchMode=yes to ssh commands
Signed-off-by: Martin J. Bligh <mbligh@google.com>
From: ericli@google.com
git-svn-id: svn://test.kernel.org/autotest/trunk@4124 592f7852-d20e-0410-864c-8624ca9c26a4
| -rw-r--r-- | server/hosts/abstract_ssh.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/server/hosts/abstract_ssh.py b/server/hosts/abstract_ssh.py index 524d0842..49797bcc 100644 --- a/server/hosts/abstract_ssh.py +++ b/server/hosts/abstract_ssh.py @@ -5,13 +5,15 @@ from autotest_lib.server.hosts import remote from autotest_lib.client.common_lib.global_config import global_config -enable_master_ssh = global_config.get_config_value( - 'AUTOSERV', 'enable_master_ssh', type=bool, default=False) +enable_master_ssh = global_config.get_config_value('AUTOSERV', + 'enable_master_ssh', + type=bool, default=False) def make_ssh_command(user="root", port=22, opts='', connect_timeout=30, alive_interval=300): - base_command = ("/usr/bin/ssh -a -x %s -o BatchMode=yes " + base_command = ("/usr/bin/ssh -a -x %s -o StrictHostKeyChecking=no " + "-o UserKnownHostsFile=/dev/null -o BatchMode=yes " "-o ConnectTimeout=%d -o ServerAliveInterval=%d " "-l %s -p %d") assert isinstance(connect_timeout, (int, long)) @@ -107,7 +109,8 @@ class AbstractSSHHost(SiteHost): appropriate scp command for encoding it. Remote paths must be pre-encoded. """ - command = "scp -rq %s -P %d %s '%s'" + command = ("scp -rq %s -o StrictHostKeyChecking=no " + "-o UserKnownHostsFile=/dev/null -P %d %s '%s'") return command % (self.master_ssh_option, self.port, " ".join(sources), dest) |