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 <dan.mick@inktank.com>

diff --git a/teuthology/lock.py b/teuthology/lock.py
index ce5951e123a962661b006d249ac93cf8e850d594..ada71a7a8b632825c2a740fb73d1aa1275669367 100644 (file)
--- 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,