From afc900bd7107087beb0a5631e5b9adb3df5d32d1 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Wed, 9 Dec 2015 11:36:39 +0100 Subject: [PATCH] radosgw-admin: zone list should print default zone Signed-off-by: Orit Wasserman --- src/rgw/rgw_admin.cc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index b4a923a6288fe..74133a6ae3df4 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -2986,7 +2986,20 @@ int main(int argc, char **argv) cerr << "failed to list zones: " << cpp_strerror(-ret) << std::endl; return -ret; } + + RGWZoneParams zone; + ret = zone.init(g_ceph_context, store, false); + if (ret < 0) { + cerr << "failed to init zone: " << cpp_strerror(-ret) << std::endl; + return -ret; + } + string default_zone; + ret = zone.read_default_id(default_zone); + if (ret < 0 && ret != -ENOENT) { + cerr << "could not determine default zone: " << cpp_strerror(-ret) << std::endl; + } formatter->open_object_section("zones_list"); + encode_json("default_info", default_zone, formatter); encode_json("zones", zones, formatter); formatter->close_section(); formatter->flush(cout); -- 2.39.5