From: Zack Cerza <zack.cerza@inktank.com>
Date: Tue, 26 Aug 2014 16:32:36 +0000 (-0600)
Subject: Fix --unlock
X-Git-Tag: 1.1.0~1208
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1637d3b45fddc64a2ba983736ca8699761aa2b9c;p=teuthology.git

Fix --unlock

Note to self: clean up user/ctx.owner confusion

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

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 5cc78433b..226e667db 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -164,6 +164,8 @@ def main(ctx):
                 machines_to_update.append(machine)
                 provision.create_if_vm(ctx, machine)
     elif ctx.unlock:
+        if ctx.owner is None and user is None:
+            user = misc.get_user()
         # If none of them are vpm, do them all in one shot
         if not filter(is_vpm, machines):
             res = unlock_many(machines, user)