]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
lock.lock_many(): use passed os_{type,version}, not ctx
authorDan Mick <dan.mick@inktank.com>
Sat, 18 Oct 2014 05:06:51 +0000 (22:06 -0700)
committerDan Mick <dan.mick@inktank.com>
Sat, 18 Oct 2014 05:06:51 +0000 (22:06 -0700)
Affects teuthology --lock with os_{type,version} in the yaml.

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

index 4896daadef24305a8939c124aadcd920a2d3d0b5..b0055209428fea2a02cc5638429f33254276e27a 100644 (file)
@@ -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