]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: look for region_map in rgw_region_root_pool 12156/head
authorCasey Bodley <cbodley@redhat.com>
Fri, 18 Nov 2016 22:04:57 +0000 (17:04 -0500)
committerLoic Dachary <ldachary@redhat.com>
Wed, 23 Nov 2016 08:16:18 +0000 (09:16 +0100)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b81d88008443cbc1b43ea93a7058284dbc44538f)

src/rgw/rgw_rados.cc

index 3f348502d127b50dd3ff7ff990daa99fb920473f..4481a167e2c05454ddd256a68f12fd050d3d603f 100644 (file)
@@ -3237,9 +3237,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;