]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: external auth engines of S3 honor rgw_keystone_implicit_tenants. 15572/head
authorRadoslaw Zarzynski <rzarzynski@mirantis.com>
Thu, 8 Jun 2017 12:33:51 +0000 (14:33 +0200)
committerRadoslaw Zarzynski <rzarzynski@mirantis.com>
Thu, 8 Jun 2017 12:43:04 +0000 (14:43 +0200)
Fixes: http://tracker.ceph.com/issues/17779
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
src/rgw/rgw_auth_s3.h
src/rgw/rgw_rest_s3.h

index cbc0bee69af0c1fea710c9fd44e59ff7fb534009..0f36837d19b0b1ba7c1cd9a26a362316756f7dfe 100644 (file)
@@ -38,7 +38,7 @@ class ExternalAuthStrategy : public rgw::auth::Strategy,
                             ) const override {
     auto apl = rgw::auth::add_sysreq(cct, store, s,
       rgw::auth::RemoteApplier(cct, store, std::move(acl_alg), info,
-                               false /* no implicit tenants */));
+                               cct->_conf->rgw_keystone_implicit_tenants));
     /* TODO(rzarzynski): replace with static_ptr. */
     return aplptr_t(new decltype(apl)(std::move(apl)));
   }
index d426b3d40caac8f5eb59f37f4062ec368606a93e..6d33bace8be1872f4c2c0c6945a4f8d9ed1628f9 100644 (file)
@@ -842,7 +842,7 @@ public:
                             ) const override {
     return aplptr_t(
       new rgw::auth::RemoteApplier(cct, store, std::move(acl_alg), info,
-                                   false /* no implicit tenants */));
+                                   cct->_conf->rgw_keystone_implicit_tenants));
   }
 
   aplptr_t create_apl_local(CephContext* const cct,