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 <owasserm@redhat.com>
(cherry picked from commit c91dd6d9efd148e0fe0f027dde537e977de9aa26)

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index d6284c777807fa2ae0a5c5de7689520a37e8cef0..df6026cc3fe3f07fc59b24960f7fc40e9fda2d42 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3239,9 +3239,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;