From: Yehuda Sadeh <yehuda@inktank.com>
Date: Thu, 20 Feb 2014 17:01:21 +0000 (-0800)
Subject: rgw: minor cleanup
X-Git-Tag: v0.79~203
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=caf2edfc4335834d52088ab61b8608d0ee2bbb9b;p=ceph.git

rgw: minor cleanup

Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/rgw/rgw_swift.cc b/src/rgw/rgw_swift.cc
index c7e707a65f99..d9654a7608de 100644
--- a/src/rgw/rgw_swift.cc
+++ b/src/rgw/rgw_swift.cc
@@ -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);