mon/MonCommand: deprecate 'osd rm'

Users should use 'osd destroy' instead.  It does more and has a scary
force flag.  And suggests that CLI users check 'osd safe-to-destroy'
first.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 4f10c9d8359cbd2490a1ceaab29f8d680dafa0c4..ae5a1b3e33cbba2a9aff964a1cb5af93ed8e9232 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -1,3 +1,10 @@
+14.0.1
+------
+
+* The 'ceph osd rm' command has been deprecated.  Users should use
+  'ceph osd destroy' or 'ceph osd purge' (but after first confirming it is
+  safe to do so via the 'ceph osd safe-to-destroy' command).
+
 >=13.1.0
 --------
 

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 58b676717f9292efe14b3ad0372352c1f933efc2..cc484a3a820b640808083113cfb38d5629925f57 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -774,11 +774,12 @@ COMMAND("osd in " \
        "set osd(s) <id> [<id>...] in, "
         "can use <any|all> to automatically set all previously out osds in", \
         "osd", "rw", "cli,rest")
-COMMAND("osd rm " \
+COMMAND_WITH_FLAG("osd rm " \
        "name=ids,type=CephString,n=N", \
        "remove osd(s) <id> [<id>...], "
         "or use <any|all> to remove all osds", \
-        "osd", "rw", "cli,rest")
+       "osd", "rw", "cli,rest",
+       FLAG(DEPRECATED))
 COMMAND("osd add-noup " \
         "name=ids,type=CephString,n=N", \
         "mark osd(s) <id> [<id>...] as noup, " \