]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: allow tenant without user id for reshard commands 18811/head
authorOrit Wasserman <owasserm@redhat.com>
Wed, 8 Nov 2017 10:01:38 +0000 (12:01 +0200)
committerOrit Wasserman <owasserm@redhat.com>
Wed, 8 Nov 2017 10:04:40 +0000 (12:04 +0200)
Fixes: http://tracker.ceph.com/issues/22046
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/rgw/rgw_admin.cc

index 17146ae2d36b18ba49cb3964a0c9ed8b58534c0e..ce3cd39718ce2330c381a51c33173f446105b1ee 100644 (file)
@@ -2857,7 +2857,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;
       }