From: Kefu Chai <kchai@redhat.com>
Date: Thu, 1 Apr 2021 11:58:41 +0000 (+0800)
Subject: rgw/rgw_admin: s/realm delete/realm rm/
X-Git-Tag: v17.1.0~2404^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40542%2Fhead;p=ceph.git

rgw/rgw_admin: s/realm delete/realm rm/

it was an oversight of fa5398d31f9467b58a8b4eda55d1b5e2bbdb6500

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index cd4c12bbe739..dce4ea0926f9 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -9,6 +9,9 @@
   that were storing state in RADOS omap, especially without striping which
   limits scalability.
 
+* RGW: `radosgw-admin realm delete` is now renamed to `radosgw-admin realm rm`. This
+  is consistent with the help message.
+
 >=16.0.0
 --------
 * mgr-pg_autoscaler: Autoscaler will now start out by scaling each
diff --git a/doc/radosgw/multisite.rst b/doc/radosgw/multisite.rst
index fc859594568f..34ec72130ba9 100644
--- a/doc/radosgw/multisite.rst
+++ b/doc/radosgw/multisite.rst
@@ -770,17 +770,17 @@ realm. Alternatively, to change which realm is the default, execute:
 Delete a Realm
 ~~~~~~~~~~~~~~
 
-To delete a realm, execute ``realm delete`` and specify the realm name.
+To delete a realm, execute ``realm rm`` and specify the realm name.
 
 ::
 
-    # radosgw-admin realm delete --rgw-realm={realm-name}
+    # radosgw-admin realm rm --rgw-realm={realm-name}
 
 For example:
 
 ::
 
-    # radosgw-admin realm delete --rgw-realm=movies
+    # radosgw-admin realm rm --rgw-realm=movies
 
 Get a Realm
 ~~~~~~~~~~~
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 3cf4ad3e6a16..1970966afd26 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -931,7 +931,7 @@ static SimpleCmd::Commands all_cmds = {
   { "datalog autotrim", OPT::DATALOG_AUTOTRIM },
   { "datalog trim", OPT::DATALOG_TRIM },
   { "realm create", OPT::REALM_CREATE },
-  { "realm delete", OPT::REALM_DELETE },
+  { "realm rm", OPT::REALM_DELETE },
   { "realm get", OPT::REALM_GET },
   { "realm get default", OPT::REALM_GET_DEFAULT },
   { "realm get-default", OPT::REALM_GET_DEFAULT },