From 4044e088d198d7451e979ea6d0b0a895d6918756 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Mon, 26 Aug 2013 10:39:27 -0400 Subject: [PATCH] fix zap command to require both hostname and disk, erroring properly Signed-off-by: Alfredo Deza --- ceph_deploy/osd.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ceph_deploy/osd.py b/ceph_deploy/osd.py index 4037005..8c61a0a 100644 --- a/ceph_deploy/osd.py +++ b/ceph_deploy/osd.py @@ -343,10 +343,13 @@ def zap(dev): except subprocess.CalledProcessError as e: raise RuntimeError(e) + def disk_zap(args): cfg = conf.load(args) for hostname, disk, journal in args.disk: + if not disk or not hostname: + raise RuntimeError('zap command needs both HOSTNAME and DISK but got "%s %s"' % (hostname, disk)) LOG.debug('zapping %s on %s', disk, hostname) # TODO username @@ -536,9 +539,9 @@ def make_disk(parser): parser.add_argument( 'disk', nargs='+', - metavar='HOST[:DISK]', + metavar='HOST:DISK', type=colon_separated, - help='host (and optionally disk)', + help='host and disk to zap', ) parser.add_argument( '--zap-disk', -- 2.47.3