Merge pull request #14144 from smithfarm/wip-19356-kraken

kraken: rgw: when converting region_map we need to use rgw_zone_root_pool Reviewed-by: Casey Bodley <cbodley@redhat.com>
ceph · Apr 12, 2017 · 2fec939 · 2fec939
2 parents 41770be + 51e8ba0
commit 2fec939
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;