From: Dan Mick <dan.mick@inktank.com>
Date: Sat, 18 Oct 2014 05:06:51 +0000 (-0700)
Subject: lock.lock_many(): use passed os_{type,version}, not ctx
X-Git-Tag: 1.1.0~1118^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d3ed4f07564055f180b34dc75823967c6af94a36;p=teuthology.git

lock.lock_many(): use passed os_{type,version}, not ctx

Affects teuthology --lock with os_{type,version} in the yaml.

Fixes: #9811
Signed-off-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/teuthology/lock.py b/teuthology/lock.py
index 4896daade..b00552094 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -305,8 +305,7 @@ def lock_many(ctx, num, machine_type, user=None, description=None,
     if user is None:
         user = misc.get_user()
 
-    if not vps_version_or_type_valid(ctx.machine_type, ctx.os_type,
-                                     ctx.os_version):
+    if not vps_version_or_type_valid(ctx.machine_type, os_type, os_version):
         log.error('Invalid os-type or version detected -- lock failed')
         return