From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Fri, 5 Feb 2016 15:07:17 +0000 (+0100)
Subject: rgw: S3 always must use token format of Keystone v2.
X-Git-Tag: v10.1.0~352^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=abbd91293de48090ac36ce3dbf27007e9d04b6a4;p=ceph.git

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 97dbaf4b1abd..2132da204f16 100644
--- 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);
   }