From 57a99c1837926d52f44b68e4084b47df3dd3beae Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Wed, 26 Oct 2022 10:26:14 +0200 Subject: [PATCH] Fixing some minor issues Signed-off-by: Redouane Kachach --- src/pybind/mgr/cephadm/serve.py | 4 ++-- src/pybind/mgr/rgw/module.py | 2 +- src/python-common/ceph/rgw/rgwam_core.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index a71f92cbe45fe..3348a2005fdca 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -585,8 +585,8 @@ class CephadmServe: rgw_spec.update_endpoints = (rc != 0) # keep trying on failure if rc != 0: self.log.error(f'Error when trying to update rgw zone: {err}') - self.mgr.set_health_warning('CEPHADM_RGW', 'Cannot update rgw endpoints', 1, - [f'Cannot update rgw endpoints for daemon {rgw_spec.service_name()}']) + self.mgr.set_health_warning('CEPHADM_RGW', 'Cannot update rgw endpoints, error: {err}', 1, + [f'Cannot update rgw endpoints for daemon {rgw_spec.service_name()}, error: {err}']) else: self.mgr.remove_health_warning('CEPHADM_RGW') diff --git a/src/pybind/mgr/rgw/module.py b/src/pybind/mgr/rgw/module.py index 74ac8a22b2acc..1f87481a7c644 100644 --- a/src/pybind/mgr/rgw/module.py +++ b/src/pybind/mgr/rgw/module.py @@ -106,7 +106,7 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule): if available: return func(self, *args, **kwargs) else: - err_msg = f"Cephadm is not available. Please enable cephadm by 'ceph mgr module enable cephadm'." + err_msg = "Orchestrator is not available. Please enable cephadm by 'ceph mgr module enable cephadm'." return HandleCommandResult(retval=-errno.EINVAL, stdout='', stderr=err_msg) return wrapper return inner diff --git a/src/python-common/ceph/rgw/rgwam_core.py b/src/python-common/ceph/rgw/rgwam_core.py index e55e0ff14b4c1..ac74405babc56 100644 --- a/src/python-common/ceph/rgw/rgwam_core.py +++ b/src/python-common/ceph/rgw/rgwam_core.py @@ -526,7 +526,7 @@ class RGWAM: if realm_name in self.realm_op().list(): raise RGWAMException(f'Realm {realm_name} already exists') if zonegroup_name in self.zonegroup_op().list(): - raise RGWAMException(f'ZonegroupOp {zonegroup_name} already exists') + raise RGWAMException(f'Zonegroup {zonegroup_name} already exists') if zone_name in self.zone_op().list(): raise RGWAMException(f'Zone {zone_name} already exists') -- 2.39.5