]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: making implicit_tenants backwards compatible. 33748/head
authorMarcus Watts <mwatts@redhat.com>
Wed, 30 May 2018 20:37:31 +0000 (16:37 -0400)
committerCasey Bodley <cbodley@redhat.com>
Fri, 6 Mar 2020 16:32:15 +0000 (11:32 -0500)
commit147605267fc49eecce3093a835490f99fdd6b9e7
treebdd24291c56885bae25871ea07946b912e4d9ee3
parent4954084eb987f89af6013270975277fec70bbfde
rgw: making implicit_tenants backwards compatible.

In jewel, "rgw keystone implicit tenants" only applied to swift. As of
luminous), this option applies to s3 also.
Sites that used this feature with jewel now have outstanding data that
depends on the old behavior.

The fix here is to expand "rgw keystone implicit tenants" so that it
can be set to any of "none", "all", "s3" or "swift" (also 0=false=none,
1=true=all).  When set to "s3" or "swift", the actual id lookup
is also partitioned.

Formerly "rgw keystone implicit tenants" was a legacy opt.
This change converts it to the new style of option,
including support for dynamically changing it.

Fixes: http://tracker.ceph.com/issues/24348
Signed-off-by: Marcus Watts <mwatts@redhat.com>
(cherry picked from commit a28a38f6e91da3abe59c34fad0e059eeaf29a65f)
(cherry picked from commit d2bdea8e7bc8eae64e4b72f581e424a9a6871aed)

Conflicts:
  - forward port from luminous was easier than backport from master
12 files changed:
doc/radosgw/keystone.rst
doc/radosgw/multitenancy.rst
src/common/legacy_config_opts.h
src/common/options.cc
src/rgw/rgw_auth.cc
src/rgw/rgw_auth.h
src/rgw/rgw_auth_registry.h
src/rgw/rgw_auth_s3.h
src/rgw/rgw_frontend.h
src/rgw/rgw_main.cc
src/rgw/rgw_rest_s3.h
src/rgw/rgw_swift_auth.h