From: Sage Weil <sage@newdream.net>
Date: Fri, 30 Apr 2021 14:13:23 +0000 (-0400)
Subject: cephadm: add --zap-osds argument to rm_cluster
X-Git-Tag: v16.2.5~39^2~4^2^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53dab93730e07054de35e32344c8e63da8798be7;p=ceph.git

cephadm: add --zap-osds argument to rm_cluster

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 14c95b54fb325240635be01dd95517d11f37106b)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 0e759e7f8f0..763e42c7daf 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -5500,6 +5500,10 @@ def command_rm_cluster(ctx):
     call(ctx, ['systemctl', 'stop', slice_name],
          verbosity=CallVerbosity.DEBUG)
 
+    # osds?
+    if ctx.zap_osds:
+        _zap_osds(ctx)
+
     # rm units
     call_throws(ctx, ['rm', '-f', ctx.unit_dir +  # noqa: W504
                       '/ceph-%s@.service' % ctx.fsid])
@@ -7612,6 +7616,10 @@ def _get_parser():
         '--keep-logs',
         action='store_true',
         help='do not remove log files')
+    parser_rm_cluster.add_argument(
+        '--zap-osds',
+        action='store_true',
+        help='zap OSD devices for this cluster')
 
     parser_run = subparsers.add_parser(
         'run', help='run a ceph daemon, in a container, in the foreground')