]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Use new ssh_keyscan() function
authorZack Cerza <zack@cerza.org>
Tue, 20 May 2014 23:33:36 +0000 (18:33 -0500)
committerZack Cerza <zack.cerza@inktank.com>
Mon, 25 Aug 2014 17:14:37 +0000 (11:14 -0600)
Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
teuthology/lock.py

index b57dadc41bd194d061fe68e85c31b7cccbb5ddb4..3fc73b591a607c362c51a84ac8bd5cd6aba23127 100644 (file)
@@ -298,12 +298,11 @@ def list_locks(machine_type=None):
 
 def update_lock(name, description=None, status=None, ssh_pub_key=None):
     status_info = get_status(name)
-    phys_host = status_info['vpshost']
-    if phys_host:
-        keyscan_out = ''
-        while not keyscan_out:
+    if status_info['is_vm']:
+        ssh_key = None
+        while not ssh_key:
             time.sleep(10)
-            keyscan_out, _ = keyscan_check([name])
+            ssh_key = ssh_keyscan(name)
     updated = {}
     if description is not None:
         updated['description'] = description