Destroy VMs before unlocking, not after

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

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 3ded5af8462e7de6500cb012a6f1ff142a555647..e14977241a2917b2cef95edebba8c78b9c1e54e0 100644 (file)
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -431,14 +431,14 @@ def unlock_one(ctx, name, user=None):
     if user is None:
         user = misc.get_user()
     name = misc.canonicalize_hostname(name, user=None)
+    if not provision.destroy_if_vm(ctx, name):
+        log.error('downburst destroy failed for %s', name)
     request = dict(name=name, locked=False, locked_by=user, description=None)
     uri = os.path.join(config.lock_server, 'nodes', name, 'lock', '')
     response = requests.put(uri, json.dumps(request))
     success = response.ok
     if success:
         log.info('unlocked %s', name)
-        if not provision.destroy_if_vm(ctx, name):
-            log.error('downburst destroy failed for %s', name)
     else:
         try:
             reason = response.json().get('message')