]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: use rgw_zone_root_pool for region_map like is done in hammer 14144/head
authorOrit Wasserman <owasserm@redhat.com>
Sun, 12 Mar 2017 10:11:28 +0000 (12:11 +0200)
committerNathan Cutler <ncutler@suse.com>
Sat, 25 Mar 2017 11:08:51 +0000 (12:08 +0100)
Fixes: http://tracker.ceph.com/issues/19195
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit c91dd6d9efd148e0fe0f027dde537e977de9aa26)

src/rgw/rgw_rados.cc

index 4f7af0f4785eada203efe323cecedfc0687d6e66..432e334b2ae54a0c13ea174c89161372b4b42035 100644 (file)
@@ -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;