radosgw-admin: zonegroup set and zone set should set the realm id

Signed-off-by: Orit Wasserman <owasserm@redhat.com>

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 4e2d4dcc54ac84c7699aaca6146561851f20777b..57c488bf201a22dfb606ad5e42b73d3c8e8e5e34 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -2650,6 +2650,9 @@ int main(int argc, char **argv)
        if (ret < 0) {
          return 1;
        }
+       if (zonegroup.realm_id.empty()) {
+         zonegroup.realm_id = realm.get_id();
+       }
        ret = zonegroup.create();
        if (ret < 0 && ret != -EEXIST) {
          cerr << "ERROR: couldn't create zonegroup info: " << cpp_strerror(-ret) << std::endl;
@@ -2935,6 +2938,16 @@ int main(int argc, char **argv)
          return 1;
        }
 
+       if(zone.realm_id.empty()) {
+         RGWRealm realm(realm_id, realm_name);
+         int ret = realm.init(g_ceph_context, store);
+         if (ret < 0) {
+           cerr << "failed to init realm: " << cpp_strerror(-ret) << std::endl;
+           return -ret;
+         }
+         zone.realm_id = realm.get_id();
+       }
+
         if (zone.get_name().empty()) {
           zone.set_name(zone_name);
           if (zone.get_name().empty()) {