From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 27 Feb 2020 21:14:15 +0000 (-0500)
Subject: radosgw-admin: 'zonegroup modify' does not require realm
X-Git-Tag: v15.1.1~171^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f62e89b4d2c3fc79112b7906080bc32039785037;p=ceph-ci.git

radosgw-admin: 'zonegroup modify' does not require realm

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index a38bfd1e8bb..ff7da8e27c3 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -4569,15 +4569,8 @@ int main(int argc, const char **argv)
       break;
     case OPT::ZONEGROUP_MODIFY:
       {
-	RGWRealm realm(realm_id, realm_name);
-	int ret = realm.init(g_ceph_context, store->svc()->sysobj);
-	if (ret < 0) {
-	  cerr << "failed to init realm: " << cpp_strerror(-ret) << std::endl;
-	  return -ret;
-	}
-
 	RGWZoneGroup zonegroup(zonegroup_id, zonegroup_name);
-	ret = zonegroup.init(g_ceph_context, store->svc()->sysobj);
+	int ret = zonegroup.init(g_ceph_context, store->svc()->sysobj);
 	if (ret < 0) {
 	  cerr << "failed to init zonegroup: " << cpp_strerror(-ret) << std::endl;
 	  return -ret;