From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 16 Jan 2018 03:05:02 +0000 (-0800)
Subject: rgw: aws sync: remove bucket suffix configurable
X-Git-Tag: v13.1.0~270^2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08451d791089d743f04708884e2423ce54a777fd;p=ceph.git

rgw: aws sync: remove bucket suffix configurable

No need to have a special suffix, target path can be used instead.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_sync_module_aws.cc b/src/rgw/rgw_sync_module_aws.cc
index 560e0ffc956b..47d0784a2ea3 100644
--- a/src/rgw/rgw_sync_module_aws.cc
+++ b/src/rgw/rgw_sync_module_aws.cc
@@ -223,8 +223,6 @@ struct AWSSyncConfig {
 
   map<string, AWSSyncConfig_Connection> connections;
 
-  string bucket_suffix;
-
   AWSSyncConfig_S3 s3;
 
   struct Target {
@@ -284,8 +282,6 @@ struct AWSSyncConfig {
       connections[new_conn["connection_id"]].init(new_conn);
     }
 
-    bucket_suffix = config["bucket_suffix"];
-
     int r = s3.init(cct, config["s3"]);
     if (r < 0) {
       return r;
@@ -363,7 +359,6 @@ struct AWSSyncConfig {
     }
     jf.close_section();
 
-    encode_json("bucket_suffix", bucket_suffix, &jf);
     s3.dump_conf(cct, jf);
 
     { // targets
@@ -385,9 +380,6 @@ struct AWSSyncConfig {
       owner += bucket_info.owner.id;
     }
     bucket_str += bucket_info.bucket.name;
-    if (!bucket_suffix.empty()) {
-      bucket_str = bucket_str + "-" + bucket_suffix;
-    }
     const Target *target{nullptr};
     const string *path{nullptr};
     if (find_target(bucket_info.bucket, &target)) {