From: Zack Cerza <zack@cerza.org>
Date: Tue, 20 May 2014 17:50:12 +0000 (-0500)
Subject: keyscan_check(): don't require ctx to be passed
X-Git-Tag: 1.1.0~1240
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0f772222a452ec71254001fd0a8d7d64f3859814;p=teuthology.git

keyscan_check(): don't require ctx to be passed

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
---

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 2faff2f274..5c17fe005c 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -123,7 +123,7 @@ def update_lock(ctx, name, description=None, status=None, ssh_pub_key=None):
         keyscan_out = ''
         while not keyscan_out:
             time.sleep(10)
-            keyscan_out, _ = keyscan_check(ctx, [name])
+            keyscan_out, _ = keyscan_check([name])
     updated = {}
     if description is not None:
         updated['description'] = description
@@ -347,15 +347,14 @@ def updatekeys(ctx):
     return scan_for_locks(ctx, machines)
 
 
-def keyscan_check(ctx, machines):
+def keyscan_check(machines):
     locks = list_locks()
     current_locks = {}
     for lock in locks:
         current_locks[lock['name']] = lock
 
-    if hasattr(ctx, 'all'):
-        if ctx.all:
-            machines = current_locks.keys()
+    if len(machines) == 0:
+        machines = current_locks.keys()
 
     for i, machine in enumerate(machines):
         if '@' in machine:
@@ -387,7 +386,7 @@ def update_keys(ctx, out, current_locks):
 
 
 def scan_for_locks(ctx, machines):
-    out, current_locks = keyscan_check(ctx, machines)
+    out, current_locks = keyscan_check(machines)
     return update_keys(ctx, out, current_locks)
 
 
diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py
index e584f1d7a1..393d25bf52 100644
--- a/teuthology/task/internal.py
+++ b/teuthology/task/internal.py
@@ -114,8 +114,7 @@ def lock_machines(ctx, config):
                 while len(keyscan_out.splitlines()) != len(vmlist):
                     loopcount += 1
                     time.sleep(10)
-                    keyscan_out, current_locks = lock.keyscan_check(ctx,
-                                                                    vmlist)
+                    keyscan_out, current_locks = lock.keyscan_check(vmlist)
                     log.info('virtual machine is still unavailable')
                     if loopcount == 40:
                         loopcount = 0