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 bd770160710c169d7e17c2b6c50ff5b05b39acd2..99d844c925157223f3ca8d1c23dec4136c9ab971 100644 (file)
--- 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;
       }