From: Sage Weil <sage@inktank.com>
Date: Tue, 2 Apr 2013 22:20:31 +0000 (-0700)
Subject: osd: fix zap
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71c39f617f2bde07b0fe1f82814b41252d481215;p=ceph-deploy.git

osd: fix zap

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

diff --git a/ceph_deploy/osd.py b/ceph_deploy/osd.py
index 9917366..35983c4 100644
--- a/ceph_deploy/osd.py
+++ b/ceph_deploy/osd.py
@@ -247,7 +247,7 @@ def zap(dev):
 def disk_zap(args):
     cfg = conf.load(args)
 
-    for hostname, disk in args.disk:
+    for hostname, disk, journal in args.disk:
         LOG.debug('zapping %s on %s', disk, hostname)
 
         # TODO username
@@ -309,7 +309,7 @@ def disk(args):
     elif args.subcommand == 'activate':
         activate(args, cfg)
     elif args.subcommand == 'zap':
-        disk_zap(args, cfg)
+        disk_zap(args)
     else:
         LOG.error('subcommand %s not implemented', args.subcommand)
         sys.exit(1)