From: Orit Wasserman <owasserm@redhat.com>
Date: Wed, 8 Nov 2017 10:01:38 +0000 (+0200)
Subject: rgw: allow tenant without user id for reshard commands
X-Git-Tag: v12.2.3~208^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=274fef45c2ca619aaad3ec14e8c6d80d22832a85;p=ceph.git

rgw: allow tenant without user id for reshard commands

Fixes: http://tracker.ceph.com/issues/22046
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 0a2142e83b58fa8e238bcb748d1cb97bdba674c5)
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index bd770160710..99d844c9251 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -2856,7 +2856,10 @@ int main(int argc, const char **argv)
                           && opt_cmd != OPT_ROLE_POLICY_PUT
                           && opt_cmd != OPT_ROLE_POLICY_LIST
                           && opt_cmd != OPT_ROLE_POLICY_GET
-                          && opt_cmd != OPT_ROLE_POLICY_DELETE) {
+                          && opt_cmd != OPT_ROLE_POLICY_DELETE
+                          && opt_cmd != OPT_RESHARD_ADD
+                          && opt_cmd != OPT_RESHARD_CANCEL
+                          && opt_cmd != OPT_RESHARD_STATUS) {
         cerr << "ERROR: --tenant is set, but there's no user ID" << std::endl;
         return EINVAL;
       }