From 381d4aa873b28a72d04cc6c50f95d38b8abdfce4 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Thu, 16 Jan 2014 12:51:39 -0800 Subject: [PATCH] lock.py: request only rsa keys from ssh-keyscan New versions of ssh-keyscan return two keytypes if possible; this breaks the comparison of "number of lines of output from keyscan" to "number of hosts we request keys from". Fix by asking for only one type of key (as older ssh-keyscans did). Fixes: #7164 Signed-off-by: Dan Mick --- teuthology/lock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teuthology/lock.py b/teuthology/lock.py index ce5951e123..ada71a7a8b 100644 --- a/teuthology/lock.py +++ b/teuthology/lock.py @@ -346,7 +346,7 @@ def keyscan_check(ctx, machines): for i, machine in enumerate(machines): if '@' in machine: _, machines[i] = machine.rsplit('@') - args = ['ssh-keyscan'] + args = ['ssh-keyscan', '-t', 'rsa'] args.extend(machines) p = subprocess.Popen( args=args, -- 2.39.5