import quincy 17.2.0

[ceph.git] / ceph / src / rgw / rgw_zone.cc

diff --git a/ceph/src/rgw/rgw_zone.cc b/ceph/src/rgw/rgw_zone.cc
index 5daffe58a8ac99335b2634af56bd4a1586134000..c8e8d09b8879a66adb8548e56b5138fa8627db8c 100644 (file)
--- a/ceph/src/rgw/rgw_zone.cc
+++ b/ceph/src/rgw/rgw_zone.cc
@@ -2418,8 +2418,9 @@ void RGWZoneGroup::decode_json(JSONObj *obj)
   JSONDecoder::decode_json("master_zone", master_zone, obj);
   JSONDecoder::decode_json("zones", zones, decode_zones, obj);
   JSONDecoder::decode_json("placement_targets", placement_targets, decode_placement_targets, obj);
-  JSONDecoder::decode_json("default_placement", default_placement.name, obj);
-  JSONDecoder::decode_json("default_storage_class", default_placement.storage_class, obj);
+  string pr;
+  JSONDecoder::decode_json("default_placement", pr, obj);
+  default_placement.from_str(pr);
   JSONDecoder::decode_json("realm_id", realm_id, obj);
   JSONDecoder::decode_json("sync_policy", sync_policy, obj);
 }