diff options
| author | Yehuda Sadeh <yehuda@redhat.com> | 2015-10-16 23:52:44 +0200 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@redhat.com> | 2016-02-12 01:13:15 +0100 |
| commit | d1e32a87be47f7bbfdde4b5d38a07e96700419b1 (patch) | |
| tree | ea2d5695cac916ab450fac03fa7cc579f5f676f0 | |
| parent | rgw_admin: update zone set (diff) | |
| download | ceph-d1e32a87be47f7bbfdde4b5d38a07e96700419b1.tar.xz ceph-d1e32a87be47f7bbfdde4b5d38a07e96700419b1.zip | |
rgw: can override master zone config
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
| -rw-r--r-- | src/rgw/rgw_rados.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 118d8d45584..139f4fefc56 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -235,9 +235,7 @@ int RGWZoneGroup::add_zone(const RGWZoneParams& zone_params, bool is_master, con { if (is_master) { if (!master_zone.empty() && master_zone != zone_params.get_id()) { - lderr(cct) << "Master zone already defined " << master_zone << " cannot add zone " - << zone_params.get_id() << dendl; - return -EINVAL; + ldout(cct, 0) << "NOTICE: overriding master zone: " << master_zone << dendl; } master_zone = zone_params.get_id(); } else if (master_zone == zone_params.get_id()) { |