]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: making implicit_tenants backwards compatible. 33749/head
authorMarcus Watts <mwatts@redhat.com>
Wed, 30 May 2018 20:37:31 +0000 (16:37 -0400)
committerCasey Bodley <cbodley@redhat.com>
Wed, 11 Mar 2020 16:01:10 +0000 (12:01 -0400)
commitc469a69ddc13f6b27f73507eadfc515c897038cc
treee2ae0d5801c611e8d201d1301f16fb67c60258f7
parenta37940c5ac55a2a99740defd21635f991b0702dd
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 3ba7be8d1ac7ee43e69eebb58263cd080cca1d38)

Conflicts:
src/rgw/rgw_main.cc (amqp, kafka)
src/rgw/rgw_auth_registry.h (sts_strategy)
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