From 51e8ba0a06f2b5574f82f0ca63a9e9b73c291b51 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Sun, 12 Mar 2017 12:11:28 +0200 Subject: [PATCH] rgw: use rgw_zone_root_pool for region_map like is done in hammer Fixes: http://tracker.ceph.com/issues/19195 Signed-off-by: Orit Wasserman (cherry picked from commit c91dd6d9efd148e0fe0f027dde537e977de9aa26) --- src/rgw/rgw_rados.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 4f7af0f4785ea..432e334b2ae54 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -3345,9 +3345,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; -- 2.39.5