fix zap command to require both hostname and disk, erroring properly

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>

diff --git a/ceph_deploy/osd.py b/ceph_deploy/osd.py
index 403700536b0de45c43e75b89febf6ef31ba82ce2..8c61a0af52e5f1f6ce6d06ba7ab2cae0284fdea8 100644 (file)
--- 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',