From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Mon, 26 Aug 2013 14:39:27 +0000 (-0400)
Subject: fix zap command to require both hostname and disk, erroring properly
X-Git-Tag: v1.2.3~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4044e088d198d7451e979ea6d0b0a895d6918756;p=ceph-deploy.git

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 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',