From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 5 Apr 2018 00:12:30 +0000 (-0700)
Subject: rgw: rename aws tier type to 'cloud'
X-Git-Tag: v13.1.0~270^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7ece026713ff57b4cac54bfcd119a5a369ed0ccb;p=ceph.git

rgw: rename aws tier type to 'cloud'

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

diff --git a/src/rgw/rgw_sync_module.cc b/src/rgw/rgw_sync_module.cc
index 309772b22d31..fb97a6acf391 100644
--- a/src/rgw/rgw_sync_module.cc
+++ b/src/rgw/rgw_sync_module.cc
@@ -66,5 +66,5 @@ void rgw_register_sync_modules(RGWSyncModulesManager *modules_manager)
   modules_manager->register_module("elasticsearch", es_module);
 
   RGWSyncModuleRef aws_module(std::make_shared<RGWAWSSyncModule>());
-  modules_manager->register_module("aws", aws_module);
+  modules_manager->register_module("cloud", aws_module);
 }
diff --git a/src/test/rgw/rgw_multi/zone_cloud.py b/src/test/rgw/rgw_multi/zone_cloud.py
index 703948c71ba7..7debba092e2c 100644
--- a/src/test/rgw/rgw_multi/zone_cloud.py
+++ b/src/test/rgw/rgw_multi/zone_cloud.py
@@ -249,7 +249,7 @@ class CloudZone(Zone):
         return True
 
     def tier_type(self):
-        return "aws"
+        return "cloud"
 
     def create(self, cluster, args = None, check_retcode = True):
         """ create the object with the given arguments """