Project

General

Profile

Download (1.69 KB)

Bug #7453 » 0001-Fix-generate-keystone-token-from-credentials.patch

Mouad Ben, 02/20/2014 08:11 AM

View differences:

src/rgw/rgw_swift.cc
KeystoneToken t;
bufferlist token_bl;
RGWGetKeystoneAdminToken token_req(cct, &token_bl);
token_req.append_header("Content-Type", "application/json");
JSONFormatter jf;
jf.open_object_section("auth");
jf.open_object_section("auth"); // XXX: Workaround to have right Json object.
jf.open_object_section("passwordCredentials");
encode_json("username", cct->_conf->rgw_keystone_admin_user, &jf);
encode_json("password", cct->_conf->rgw_keystone_admin_password, &jf);
jf.close_section();
encode_json("tenantName", cct->_conf->rgw_keystone_admin_tenant, &jf);
jf.close_section();
jf.close_section();
std::stringstream ss;
jf.flush(ss);
token_req.set_post_data(ss.str());
int ret = token_req.process(token_url.c_str());
int ret = token_req.process("POST", token_url.c_str());
if (ret < 0)
return ret;
if (t.parse(cct, token_bl) != 0)
(2-2/2)