lock.ops.lock_many: Unlock on reimage failure

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

diff --git a/teuthology/lock/ops.py b/teuthology/lock/ops.py
index 968ab8641d0ec609fa4b87847953b22e0d24555d..f9662b44cfcff406d8c091ba1e4fa551796464ee 100644 (file)
--- a/teuthology/lock/ops.py
+++ b/teuthology/lock/ops.py
@@ -143,7 +143,12 @@ def lock_many(ctx, num, machine_type, user=None, description=None,
                 update_nodes(ok_machs)
                 return ok_machs
             elif reimage and machine_type in reimage_types:
-                return reimage_machines(ctx, machines, machine_type)
+                try:
+                    return reimage_machines(ctx, machines, machine_type)
+                except Exception:
+                    log.exception('Reimaging error. Unlocking machines...')
+                    unlock_many(machines, user)
+                    continue
             return machines
         elif response.status_code == 503:
             log.error('Insufficient nodes available to lock %d %s nodes.',