From 822d45e5edd356dd4aaf07f59e7d227c583ba159 Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Tue, 11 Oct 2022 16:53:02 +0200 Subject: [PATCH] Fixing output of create zone when several spec zones are provided Signed-off-by: Redouane Kachach (cherry picked from commit 7b89b2247c06a6b2ab687e76555105f1a73f2407) --- src/pybind/mgr/rgw/module.py | 8 ++++---- src/python-common/ceph/rgw/rgwam_core.py | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/pybind/mgr/rgw/module.py b/src/pybind/mgr/rgw/module.py index 2b08151aa88..1595f791b18 100644 --- a/src/pybind/mgr/rgw/module.py +++ b/src/pybind/mgr/rgw/module.py @@ -277,15 +277,15 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule): return HandleCommandResult(retval=-errno.EINVAL, stdout='', stderr=err_msg) try: + created_zones = [] for rgw_spec in rgw_specs: - retval, out, err = RGWAM(self.env).zone_create(rgw_spec, start_radosgw) - if retval != 0: - break + RGWAM(self.env).zone_create(rgw_spec, start_radosgw) + created_zones.append(rgw_spec.rgw_zone) except RGWAMException as e: self.log.error('cmd run exception: (%d) %s' % (e.retcode, e.message)) return HandleCommandResult(retval=e.retcode, stdout=e.stdout, stderr=e.stderr) - return HandleCommandResult(retval=retval, stdout=out, stderr=err) + return HandleCommandResult(retval=0, stdout=f"Zones {', '.join(created_zones)} created successfully") @CLICommand('rgw realm reconcile', perm='rw') def _cmd_rgw_realm_reconcile(self, diff --git a/src/python-common/ceph/rgw/rgwam_core.py b/src/python-common/ceph/rgw/rgwam_core.py index c19deaf0c10..e7c09b590b3 100644 --- a/src/python-common/ceph/rgw/rgwam_core.py +++ b/src/python-common/ceph/rgw/rgwam_core.py @@ -795,8 +795,6 @@ class RGWAM: rgw_spec.rgw_token = realm_token_s self.env.mgr.apply_rgw(rgw_spec) - return (0, f'Created zone {zone.name} {zone.id}', '') - def _get_daemon_eps(self, realm_name=None, zonegroup_name=None, zone_name=None): # get running daemons info service_name = None -- 2.47.3