From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Mon, 27 Jan 2020 15:44:17 +0000 (-0500)
Subject: Merge pull request #31185 from joke-lee/rgw-user-modify-placement
X-Git-Tag: v15.1.0~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4bf2f02506eab35e24a7c5bb83a8593b8add1fd8;p=ceph.git

Merge pull request #31185 from joke-lee/rgw-user-modify-placement

rgw: support specify user default placement and placement_tags when create or modify user

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

4bf2f02506eab35e24a7c5bb83a8593b8add1fd8
diff --cc src/rgw/rgw_rest_user.cc
index 89a339468b9f,b8414812fedc..8e6984a7a165
--- a/src/rgw/rgw_rest_user.cc
+++ b/src/rgw/rgw_rest_user.cc
@@@ -142,8 -145,10 +145,10 @@@ void RGWOp_User_Create::execute(
    RESTArgs::get_bool(s, "system", false, &system);
    RESTArgs::get_bool(s, "exclusive", false, &exclusive);
    RESTArgs::get_string(s, "op-mask", op_mask_str, &op_mask_str);
+   RESTArgs::get_string(s, "default-placement", default_placement_str, &default_placement_str);
+   RESTArgs::get_string(s, "placement-tags", placement_tags_str, &placement_tags_str);
  
 -  if (!s->user->system && system) {
 +  if (!s->user->get_info().system && system) {
      ldout(s->cct, 0) << "cannot set system flag by non-system user" << dendl;
      http_ret = -EINVAL;
      return;
@@@ -260,8 -281,10 +284,10 @@@ void RGWOp_User_Modify::execute(
  
    RESTArgs::get_bool(s, "system", false, &system);
    RESTArgs::get_string(s, "op-mask", op_mask_str, &op_mask_str);
+   RESTArgs::get_string(s, "default-placement", default_placement_str, &default_placement_str);
+   RESTArgs::get_string(s, "placement-tags", placement_tags_str, &placement_tags_str);
  
 -  if (!s->user->system && system) {
 +  if (!s->user->get_info().system && system) {
      ldout(s->cct, 0) << "cannot set system flag by non-system user" << dendl;
      http_ret = -EINVAL;
      return;