From: Dan Mick <dan.mick@redhat.com>
Date: Tue, 12 May 2015 01:18:04 +0000 (-0700)
Subject: lock.py: remove dead code trying to deal with locks
X-Git-Tag: 1.1.0~936^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=319a3057870704d005197960b1c20c56f7d04955;p=teuthology.git

lock.py: remove dead code trying to deal with locks

Without this, lock.py keeps trying to get at the key in
case it might need it later...but there's nothing that even
uses that information left, so it just causes a delay.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 1eafbd6105..53d2f2b1f3 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -13,7 +13,6 @@ import teuthology
 from . import misc
 from . import provision
 from .config import config
-from .contextutil import safe_while
 from .lockstatus import get_status
 
 log = logging.getLogger(__name__)
@@ -537,17 +536,6 @@ def find_stale_locks(owner=None):
 
 def update_lock(name, description=None, status=None, ssh_pub_key=None):
     name = misc.canonicalize_hostname(name, user=None)
-    # Only do VM specific things (key lookup) if we are not
-    # Just updating the status (like marking down).
-    if not status:
-        status_info = get_status(name)
-        if status_info['is_vm']:
-            with safe_while(sleep=1, tries=15, _raise=False,
-                            action='ssh-keyscan') as proceed:
-                while proceed():
-                    ssh_key = ssh_keyscan([name])
-                    if ssh_key:
-                        break
     updated = {}
     if description is not None:
         updated['description'] = description