]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: look for region_map in rgw_region_root_pool 12076/head
authorCasey Bodley <cbodley@redhat.com>
Fri, 18 Nov 2016 22:04:57 +0000 (17:04 -0500)
committerCasey Bodley <cbodley@redhat.com>
Fri, 18 Nov 2016 22:04:57 +0000 (17:04 -0500)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/rgw_rados.cc

index 17cc7fa24f84bb48a73abb0125bc2b3169ab9b14..3127ab0042251c1c1e86b65175639eab240b4fd4 100644 (file)
@@ -3334,9 +3334,9 @@ int RGWRados::convert_regionmap()
 {
   RGWZoneGroupMap zonegroupmap;
 
-  string pool_name = cct->_conf->rgw_zone_root_pool;
+  string pool_name = cct->_conf->rgw_region_root_pool;
   if (pool_name.empty()) {
-    pool_name = RGW_DEFAULT_ZONE_ROOT_POOL;
+    pool_name = RGW_DEFAULT_ZONEGROUP_ROOT_POOL;
   }
   string oid = region_map_oid;