]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: minor cleanup
authorYehuda Sadeh <yehuda@inktank.com>
Thu, 20 Feb 2014 17:01:21 +0000 (09:01 -0800)
committerYehuda Sadeh <yehuda@inktank.com>
Thu, 20 Feb 2014 17:19:13 +0000 (09:19 -0800)
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
src/rgw/rgw_swift.cc

index c7e707a65f99d89a860e4d53c589de0d3e93fb84..d9654a7608ded86d168bf00d9b91945ef71e835c 100644 (file)
@@ -254,8 +254,8 @@ int RGWSwift::get_keystone_admin_token(std::string& token)
     RGWGetKeystoneAdminToken token_req(cct, &token_bl);
     token_req.append_header("Content-Type", "application/json");
     JSONFormatter jf;
+    jf.open_object_section("token_request");
     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);