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 309772b22d317e73ac4ef85a1438dba78bd6e4f4..fb97a6acf391ef5baadb6896c4f910f0b18573c5 100644 (file)
--- 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 703948c71ba7ae332dca37a91d14ce453138de24..7debba092e2cd5bffa0d1f5ca1cd0c047c79d4e8 100644 (file)
--- 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 """