From 5f774a1d1a9445389b3c7ce18d62ef88b9eddfb2 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 14 Oct 2015 11:37:48 -0700 Subject: [PATCH] rgw_admin: realm set-default -> realm default to be in line with the other default commands Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_admin.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 5395a6acf103d..2defd7a19b562 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -92,7 +92,7 @@ void _usage() cerr << " realm remove remove a zonegroup from the realm\n"; cerr << " realm rename rename a realm\n"; cerr << " realm set set realm info (requires infile)\n"; - cerr << " realm set-default set realm as default\n"; + cerr << " realm default set realm as default\n"; cerr << " zonegroup create create a new zone group info\n"; cerr << " zonegroup default set default zone group\n"; cerr << " zonegroup delete delete a zone group info\n"; @@ -347,7 +347,7 @@ enum { OPT_REALM_REMOVE, OPT_REALM_RENAME, OPT_REALM_SET, - OPT_REALM_SET_DEFAULT, + OPT_REALM_DEFAULT, OPT_PERIOD_PREPARE, OPT_PERIOD_DELETE, OPT_PERIOD_GET, @@ -551,8 +551,8 @@ static int get_cmd(const char *cmd, const char *prev_cmd, const char *prev_prev_ return OPT_REALM_RENAME; if (strcmp(cmd, "set") == 0) return OPT_REALM_SET; - if (strcmp(cmd, "set-default") == 0) - return OPT_REALM_SET_DEFAULT; + if (strcmp(cmd, "default") == 0) + return OPT_REALM_DEFAULT; } else if (strcmp(prev_cmd, "zonegroup") == 0) { if (strcmp(cmd, "create")== 0) return OPT_ZONEGROUP_CREATE; @@ -1797,7 +1797,7 @@ int main(int argc, char **argv) opt_cmd == OPT_REALM_LIST_PERIODS || opt_cmd == OPT_REALM_GET_DEFAULT || opt_cmd == OPT_REALM_REMOVE || opt_cmd == OPT_REALM_RENAME || opt_cmd == OPT_REALM_SET || - opt_cmd == OPT_REALM_SET_DEFAULT); + opt_cmd == OPT_REALM_DEFAULT); if (raw_storage_op) { store = RGWStoreManager::get_raw_storage(g_ceph_context); @@ -2200,7 +2200,7 @@ int main(int argc, char **argv) } break; - case OPT_REALM_SET_DEFAULT: + case OPT_REALM_DEFAULT: { RGWRealm realm(realm_id, realm_name); int ret = realm.init(g_ceph_context, store); -- 2.39.5