From 66e0d56a1253eb5043b47ef41630ff29cb941b0b Mon Sep 17 00:00:00 2001 From: "lu.shasha" Date: Tue, 10 Oct 2017 15:39:17 +0800 Subject: [PATCH] rgw: clean up "realm remove" in radosgw-admin Signed-off-by: Shasha Lu --- src/rgw/rgw_admin.cc | 6 +----- src/test/cli/radosgw-admin/help.t | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index b49b76fd34237..065af9c396f44 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -111,7 +111,6 @@ void usage() cout << " realm get-default get default realm name\n"; cout << " realm list list realms\n"; cout << " realm list-periods list all realm periods\n"; - cout << " realm remove remove a zonegroup from the realm\n"; cout << " realm rename rename a realm\n"; cout << " realm set set realm info (requires infile)\n"; cout << " realm default set realm as default\n"; @@ -452,7 +451,6 @@ enum { OPT_REALM_GET_DEFAULT, OPT_REALM_LIST, OPT_REALM_LIST_PERIODS, - OPT_REALM_REMOVE, OPT_REALM_RENAME, OPT_REALM_SET, OPT_REALM_DEFAULT, @@ -717,8 +715,6 @@ static int get_cmd(const char *cmd, const char *prev_cmd, const char *prev_prev_ return OPT_REALM_LIST; if (strcmp(cmd, "list-periods") == 0) return OPT_REALM_LIST_PERIODS; - if (strcmp(cmd, "remove") == 0) - return OPT_REALM_REMOVE; if (strcmp(cmd, "rename") == 0) return OPT_REALM_RENAME; if (strcmp(cmd, "set") == 0) @@ -2921,7 +2917,7 @@ int main(int argc, const char **argv) OPT_GLOBAL_QUOTA_ENABLE, OPT_GLOBAL_QUOTA_DISABLE, OPT_REALM_DELETE, OPT_REALM_GET, OPT_REALM_LIST, OPT_REALM_LIST_PERIODS, - OPT_REALM_GET_DEFAULT, OPT_REALM_REMOVE, + OPT_REALM_GET_DEFAULT, OPT_REALM_RENAME, OPT_REALM_SET, OPT_REALM_DEFAULT, OPT_REALM_PULL}; diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t index 5eada2a4089bf..3bc21a2ddd591 100644 --- a/src/test/cli/radosgw-admin/help.t +++ b/src/test/cli/radosgw-admin/help.t @@ -55,7 +55,6 @@ realm get-default get default realm name realm list list realms realm list-periods list all realm periods - realm remove remove a zonegroup from the realm realm rename rename a realm realm set set realm info (requires infile) realm default set realm as default -- 2.39.5