From: Warren Usui <warren.usui@inktank.com>
Date: Fri, 10 May 2013 17:18:44 +0000 (-0700)
Subject: Do not scan for vm locks when listing all machines.
X-Git-Tag: v11.1.1~58^2^2~902^2~862
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a12464f7db0f6a8b6319b264085c51449ffc9024;p=ceph.git

Do not scan for vm locks when listing all machines.

Fixes: #4830
Signed-off-by: Warren Usui <warren.usui@inktank.com>
---

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 949a549712adf..146f10859bf12 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -277,8 +277,10 @@ Lock, unlock, or query lock status of machines.
                 if vmachine['locked']:
                     vmachines.append(vmachine['name'])
         if vmachines:
-            scan_for_locks(ctx, vmachines)
+            # Avoid ssh-keyscans for everybody when listing all machines
+            # Listing specific machines will update the keys.
             if machines:
+                scan_for_locks(ctx, vmachines)
                 statuses = [ls.get_status(ctx, machine) for machine in machines]
             else:
                 statuses = list_locks(ctx)