From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 18 Nov 2016 22:04:57 +0000 (-0500)
Subject: rgw: look for region_map in rgw_region_root_pool
X-Git-Tag: v10.2.6~72^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0b4e60cd33337cb5944aa95b9e22451ea384dec;p=ceph.git

rgw: look for region_map in rgw_region_root_pool

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b81d88008443cbc1b43ea93a7058284dbc44538f)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 3f348502d127..4481a167e2c0 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -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;