From 097e11c04a40e013e91a7a64836c98413af6a71a Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 10 Jul 2015 12:28:06 -0600 Subject: [PATCH] Revert "lock.py: is_vpm should test is_vm" This reverts commit be9aa8a6cfe6c3d182ba640ceadf1b3a2ff93d53. is_vm() is passing 'user@host' instead of just 'host' Signed-off-by: Zack Cerza --- teuthology/lock.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/teuthology/lock.py b/teuthology/lock.py index 73bb648ed2..1fc685e4f6 100644 --- a/teuthology/lock.py +++ b/teuthology/lock.py @@ -17,9 +17,7 @@ from .lockstatus import get_status log = logging.getLogger(__name__) - -def is_vm(name): - return get_status(name)['is_vm'] +is_vpm = lambda name: 'vpm' in name def get_distro_from_downburst(): @@ -316,7 +314,7 @@ def main(ctx): 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_vm, machines): + if not filter(is_vpm, machines): res = unlock_many(machines, user) return 0 if res else 1 for machine in machines: -- 2.39.5