rgw: S3 always must use token format of Keystone v2.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

diff --git a/src/rgw/rgw_rest_s3.h b/src/rgw/rgw_rest_s3.h
index 97dbaf4b1abde0963744e2c3967c9a3654d90ce0..2132da204f168a4540fab3aa677c5a96b8d0f1a0 100644 (file)
--- a/src/rgw/rgw_rest_s3.h
+++ b/src/rgw/rgw_rest_s3.h
@@ -357,7 +357,10 @@ private:
 public:
   explicit RGW_Auth_S3_Keystone_ValidateToken(CephContext *_cct)
       : RGWHTTPClient(_cct),
-        response(KeystoneToken(KeystoneService::get_api_version())) {
+        /* This is really crazy but S3Extension in Keystone always
+         * returns token conforming to v2 - regardless whether you
+         * have requested v3 or not. */
+        response(KeystoneToken(KeystoneApiVersion::VER_2)) {
     get_str_list(cct->_conf->rgw_keystone_accepted_roles, roles_list);
   }