From: Sascha Lucas Date: Thu, 9 Oct 2025 14:18:14 +0000 (+0200) Subject: doc: fix syntax for removing zone from zonegroup X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c6e14f651fcacfcbb7854b62985f30b3163ac17;p=ceph.git 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 --- diff --git a/doc/man/8/radosgw-admin.rst b/doc/man/8/radosgw-admin.rst index 1c171dffdb5..aed443841f2 100644 --- 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 87e9a32659d..ab0c0b51019 100644 --- 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 61525fa9be7..9eaaa44917e 100644 --- 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 e5f1f69541d..f19eff74cfe 100644 --- 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