doc: fix syntax for removing zone from zonegroup

According to [1], `zonegroup remove` seems to be the correct syntax to
remove a zone from a zonegroup (also works for me).

[1] https://github.com/ceph/ceph/blob/aea1dd81cd6e048a5f535fb0f2b9acc2d0c794b1/src/rgw/radosgw-admin/radosgw-admin.cc#L1034

Signed-off-by: Sascha Lucas <sascha_lucas@web.de>

diff --git a/doc/man/8/radosgw-admin.rst b/doc/man/8/radosgw-admin.rst
index 1c171dffdb52c1ccb79c08113dbfbf8d5133e050..aed443841f20694fb22e6c7886cb209cd1c2626d 100644 (file)
--- a/doc/man/8/radosgw-admin.rst
+++ b/doc/man/8/radosgw-admin.rst
@@ -240,7 +240,7 @@ as follows:
 :command:`zonegroup default`
   Set the default zone group.
 
-:command:`zonegroup rm`
+:command:`zonegroup delete`
   Remove a zone group info.
 
 :command:`zonegroup get`

diff --git a/doc/radosgw/multisite.rst b/doc/radosgw/multisite.rst
index 87e9a32659d412babc26f049eef1f4a4e7339b4f..ab0c0b510194693be98b6418b0696b435984d9bb 100644 (file)
--- a/doc/radosgw/multisite.rst
+++ b/doc/radosgw/multisite.rst
@@ -288,7 +288,7 @@ Delete Default Zonegroup and Zone
 
    .. prompt:: bash #
 
-      radosgw-admin zonegroup delete --rgw-zonegroup=default --rgw-zone=default
+      radosgw-admin zonegroup remove --rgw-zonegroup=default --rgw-zone=default
       radosgw-admin period update --commit
       radosgw-admin zone delete --rgw-zone=default
       radosgw-admin period update --commit

diff --git a/src/rgw/radosgw-admin/radosgw-admin.cc b/src/rgw/radosgw-admin/radosgw-admin.cc
index 61525fa9be7a96dfab374bdce842e520eb7887c8..9eaaa44917e1cbd1802ba4440c39dd68d447d293 100644 (file)
--- a/src/rgw/radosgw-admin/radosgw-admin.cc
+++ b/src/rgw/radosgw-admin/radosgw-admin.cc
@@ -245,7 +245,7 @@ void usage()
   cout << "  zonegroup get                    show zone group info\n";
   cout << "  zonegroup modify                 modify an existing zonegroup\n";
   cout << "  zonegroup set                    set zone group info (requires infile)\n";
-  cout << "  zonegroup rm                     remove a zone from a zonegroup\n";
+  cout << "  zonegroup remove                 remove a zone from a zonegroup\n";
   cout << "  zonegroup rename                 rename a zone group\n";
   cout << "  zonegroup list                   list all zone groups set on this cluster\n";
   cout << "  zonegroup placement list         list zonegroup's placement targets\n";

diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t
index e5f1f69541d2a86e9db8bad88aa44f78ef7cc10d..f19eff74cfe37d971e045c3483647bf7fe04deba 100644 (file)
--- a/src/test/cli/radosgw-admin/help.t
+++ b/src/test/cli/radosgw-admin/help.t
@@ -106,7 +106,7 @@
     zonegroup get                    show zone group info
     zonegroup modify                 modify an existing zonegroup
     zonegroup set                    set zone group info (requires infile)
-    zonegroup rm                     remove a zone from a zonegroup
+    zonegroup remove                 remove a zone from a zonegroup
     zonegroup rename                 rename a zone group
     zonegroup list                   list all zone groups set on this cluster
     zonegroup placement list         list zonegroup's placement targets