]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: use rgw_zone_root_pool for region_map like is done in hammer
authorOrit Wasserman <owasserm@redhat.com>
Sun, 12 Mar 2017 10:11:28 +0000 (12:11 +0200)
committerOrit Wasserman <owasserm@redhat.com>
Sun, 12 Mar 2017 10:11:28 +0000 (12:11 +0200)
Fixes: http://tracker.ceph.com/issues/19195
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/rgw/rgw_rados.cc

index af00d1980ce9653c1ed1625ac7b33dbb30b8b64f..9820a23ec5267244ee043518128df6a59fd4b69e 100644 (file)
@@ -3424,9 +3424,9 @@ int RGWRados::convert_regionmap()
 {
   RGWZoneGroupMap zonegroupmap;
 
-  string pool_name = cct->_conf->rgw_region_root_pool;
+  string pool_name = cct->_conf->rgw_zone_root_pool;
   if (pool_name.empty()) {
-    pool_name = RGW_DEFAULT_ZONEGROUP_ROOT_POOL;
+    pool_name = RGW_DEFAULT_ZONE_ROOT_POOL;
   }
   string oid = region_map_oid;