RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27100 from ddiss/trivial_rgw_auth_keystone_gcc_warning

Browse Source 
[trivial] rgw: fix minor compiler warning in keystone auth

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2019-03-21 10:05:18 -04:00 committed by GitHub
commit 9663480f3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rgw/rgw_auth_keystone.cc
View File

@ -305,7 +305,7 @@ EC2Engine::get_from_keystone(const DoutPrefixProvider* dpp, const boost::string_
} }
const auto api_version = config.get_api_version(); const auto api_version = config.get_api_version();
if (config.get_api_version() == rgw::keystone::ApiVersion::VER_3) { if (api_version == rgw::keystone::ApiVersion::VER_3) {
keystone_url.append("v3/s3tokens"); keystone_url.append("v3/s3tokens");
} else { } else {
keystone_url.append("v2.0/s3tokens"); keystone_url.append("v2.0/s3tokens");
@ -394,7 +394,7 @@ std::pair<boost::optional<std::string>, int> EC2Engine::get_secret_from_keystone
} }
const auto api_version = config.get_api_version(); const auto api_version = config.get_api_version();
if (config.get_api_version() == rgw::keystone::ApiVersion::VER_3) { if (api_version == rgw::keystone::ApiVersion::VER_3) {
keystone_url.append("v3/"); keystone_url.append("v3/");
} else { } else {
keystone_url.append("v2.0/"); keystone_url.append("v2.0/");