Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rgw: support admin credentials in S3-related Keystone authentication. #6131

Merged
merged 1 commit into from Jan 29, 2016

Conversation

rzarzynski
Copy link
Contributor

No description provided.

@rzarzynski
Copy link
Contributor Author

@yehudasa number of lines affected by this PR has been decreased several times. Previous version is available as well.

@yehudasa
Copy link
Member

@rzarzynski great, much better!

@zaitcev
Copy link
Contributor

zaitcev commented Nov 18, 2015

Looks good to me, but somewhat overcommented perhaps? There's a place where comment literally says "get auth token from Keystone" and the function name is get_keystone_admin_token().

@rzarzynski
Copy link
Contributor Author

@yehudasa rebased to master and improved spacing according to Matt's comment.

Today I've tested the patch using s3-tests, Tempest and manually against radosgw in many different configurations (Keystone/admin token, Keystone/admin credentials, internal RADOS-based auth). Tests showed there is no regression here. IMO the PR is ready to merge.

string admin_token_id;
int r = RGWSwift::get_keystone_admin_token(cct, admin_token_id);
if (r < 0) {
dout(2) << "s3 keystone: cannot get token for keystone access" << dendl;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rzarzynski one small nitpick, please change this dout(2) to ldout(cct, 2). Once that's done I'll merge it.

Fixes: ceph#13302
Backport: infernalis, hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
@rzarzynski
Copy link
Contributor Author

@yehudasa thanks for pointing the dout. Pushed amended commit.

yehudasa added a commit that referenced this pull request Jan 29, 2016
rgw: support admin credentials in S3-related Keystone authentication.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
@yehudasa yehudasa merged commit 3016287 into ceph:master Jan 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants