From 0a2142e83b58fa8e238bcb748d1cb97bdba674c5 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Wed, 8 Nov 2017 12:01:38 +0200 Subject: [PATCH] rgw: allow tenant without user id for reshard commands Fixes: http://tracker.ceph.com/issues/22046 Signed-off-by: Orit Wasserman --- src/rgw/rgw_admin.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 17146ae2d36b..ce3cd39718ce 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -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; } -- 2.47.3