From 4296c29302faf56bfbc76d5961868f7adb09b292 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 11 Jun 2018 17:11:16 -0500 Subject: [PATCH] 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 --- PendingReleaseNotes | 7 +++++++ src/mon/MonCommands.h | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index 4f10c9d8359..ae5a1b3e33c 100644 --- 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 58b676717f9..cc484a3a820 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -774,11 +774,12 @@ COMMAND("osd in " \ "set osd(s) [...] in, " "can use 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) [...], " "or use 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) [...] as noup, " \ -- 2.39.5