From: Orit Wasserman <owasserm@redhat.com>
Date: Sun, 12 Mar 2017 10:11:28 +0000 (+0200)
Subject: rgw: use rgw_zone_root_pool for region_map like is done in hammer
X-Git-Tag: v10.2.8~90^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e123e6d6c8bbd54514b498df5a22d961f0cefbb;p=ceph.git

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 d6284c777807..df6026cc3fe3 100644
--- 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;