From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 14 Oct 2015 23:24:01 +0000 (-0700)
Subject: rgw_admin: can set zonegroup api name
X-Git-Tag: v10.1.0~354^2~348
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56bbadf258d28833a807172e1beb98a23de97fbb;p=ceph.git

rgw_admin: can set zonegroup api name

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 85b010c8ae04..3b4f1daaf09c 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -1359,6 +1359,7 @@ int main(int argc, char **argv)
   std::string realm_name, realm_id, realm_new_name;
   std::string zone_name, zone_id, zone_new_name;
   std::string zonegroup_name, zonegroup_id, zonegroup_new_name;
+  std::string api_name;
   list<string> endpoints;
   std::string master_url;
   int is_master = false;
@@ -1685,6 +1686,8 @@ int main(int argc, char **argv)
       zonegroup_id = val;
     } else if (ceph_argparse_witharg(args, i, &val, "--zonegroup-new-name", (char*)NULL)) {
       zonegroup_new_name = val;
+    } else if (ceph_argparse_witharg(args, i, &val, "--api-name", (char*)NULL)) {
+      api_name = val;
     } else if (ceph_argparse_witharg(args, i, &val, "--zone-id", (char*)NULL)) {
       zone_id = val;
     } else if (ceph_argparse_witharg(args, i, &val, "--zone-new-name", (char*)NULL)) {
@@ -2220,6 +2223,7 @@ int main(int argc, char **argv)
 	}
 
 	RGWZoneGroup zonegroup(zonegroup_name, is_master, g_ceph_context, store, realm.get_id(), endpoints);
+        zonegroup.api_name = (api_name.empty() ? zonegroup_name : api_name);
 	ret = zonegroup.create();
 	if (ret < 0) {
 	  cerr << "failed to create zonegroup" << zonegroup_name << ": " << cpp_strerror(-ret) << std::endl;
@@ -2364,6 +2368,11 @@ int main(int argc, char **argv)
           need_update = true;
         }
 
+        if (!api_name.empty()) {
+          zonegroup.api_name = api_name;
+          need_update = true;
+        }
+
         if (need_update) {
 	  ret = zonegroup.update();
 	  if (ret < 0) {