From: Sage Weil <sage@inktank.com>
Date: Sat, 13 Jul 2013 20:09:07 +0000 (-0700)
Subject: lock: drop machine-type default, but require for lock-many
X-Git-Tag: 1.1.0~2078^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1d16a9ba7f1a373287925014e31574a2f141b272;p=teuthology.git

lock: drop machine-type default, but require for lock-many

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/teuthology/lock.py b/teuthology/lock.py
index b97e61cdc4..b5350aa9dd 100644
--- a/teuthology/lock.py
+++ b/teuthology/lock.py
@@ -182,7 +182,7 @@ Lock, unlock, or query lock status of machines.
         )
     parser.add_argument(
         '--machine-type',
-        default='plana',
+        default=None,
         help='Type of machine to lock',
         )
     parser.add_argument(
@@ -267,6 +267,9 @@ Lock, unlock, or query lock status of machines.
             '--all and --owner are mutually exclusive'
         assert not machines, \
             '--all and listing specific machines are incompatible'
+    if ctx.num_to_lock:
+        assert ctx.machine_type, \
+            'must specify machine type to lock'
 
     if ctx.brief:
         assert ctx.list, '--brief only applies to --list'