From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Thu, 23 Feb 2017 10:12:31 +0000 (+0100)
Subject: rgw: RGWRestConn allow keys to be initialized
X-Git-Tag: v13.1.0~270^2~119
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17cfaba384317315c830fedf0a129feaacbf6bf6;p=ceph.git

rgw: RGWRestConn allow keys to be initialized

This allows for other s3 clients to be created, we previously only set
the value of S3 system key from rados.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/rgw/rgw_rest_conn.cc b/src/rgw/rgw_rest_conn.cc
index d087c5a32300..a8871efdd47e 100644
--- a/src/rgw/rgw_rest_conn.cc
+++ b/src/rgw/rgw_rest_conn.cc
@@ -8,9 +8,11 @@
 
 RGWRESTConn::RGWRESTConn(CephContext *_cct, RGWRados *store,
                          const string& _remote_id,
-                         const list<string>& remote_endpoints)
+                         const list<string>& remote_endpoints,
+                         RGWAccessKey _cred)
   : cct(_cct),
     endpoints(remote_endpoints.begin(), remote_endpoints.end()),
+    key(std::move(_cred)),
     remote_id(_remote_id)
 {
   if (store) {
diff --git a/src/rgw/rgw_rest_conn.h b/src/rgw/rgw_rest_conn.h
index e9941856f577..32c7e673e86c 100644
--- a/src/rgw/rgw_rest_conn.h
+++ b/src/rgw/rgw_rest_conn.h
@@ -60,7 +60,8 @@ class RGWRESTConn
 
 public:
 
-  RGWRESTConn(CephContext *_cct, RGWRados *store, const string& _remote_id, const list<string>& endpoints);
+  RGWRESTConn(CephContext *_cct, const string& _remote_id, const list<string>& endpoints, RGWAccessKey _cred);
+
   // custom move needed for atomic
   RGWRESTConn(RGWRESTConn&& other);
   RGWRESTConn& operator=(RGWRESTConn&& other);