From f8c32b0fcc2f56d5ec66623a3c9539f2dc8db3d6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 17 Mar 2021 15:49:47 -0400 Subject: [PATCH] mgr/cephadm: clean up misc messages - join list with ' ' - key, not keyring - -ing, not ': ' Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 2 +- src/pybind/mgr/cephadm/services/cephadmservice.py | 2 +- src/pybind/mgr/cephadm/services/nfs.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index b712f3a388a55..3bdb94ce3b9b3 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -1781,7 +1781,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule, args.append((name, host)) if not args: raise OrchestratorError('Unable to find daemon(s) %s' % (names)) - self.log.info('Remove daemons %s' % [a[0] for a in args]) + self.log.info('Remove daemons %s' % ' '.join([a[0] for a in args])) return self._remove_daemons(args) @handle_orch_error diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index 006bcfe1555f1..8579ed5aa4790 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -442,7 +442,7 @@ class CephService(CephadmService): entity = self.get_auth_entity(daemon_id, host=host) - logger.info(f'Remove keyring: {entity}') + logger.info(f'Removing key for {entity}') ret, out, err = self.mgr.mon_command({ 'prefix': 'auth rm', 'entity': entity, diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py index 1eca6f923a450..e5773bfb19423 100644 --- a/src/pybind/mgr/cephadm/services/nfs.py +++ b/src/pybind/mgr/cephadm/services/nfs.py @@ -117,7 +117,7 @@ class NFSService(CephService): if spec.namespace: osd_caps = '%s namespace=%s' % (osd_caps, spec.namespace) - logger.info('Create keyring: %s' % entity) + logger.info('Creating key for %s' % entity) keyring = self.get_keyring_with_caps(entity, ['mon', 'allow r', 'osd', osd_caps]) @@ -128,7 +128,7 @@ class NFSService(CephService): daemon_id = daemon_spec.daemon_id entity: AuthEntity = self.get_auth_entity(f'{daemon_id}-rgw') - logger.info('Create keyring: %s' % entity) + logger.info('Creating key for %s' % entity) keyring = self.get_keyring_with_caps(entity, ['mon', 'allow r', 'osd', 'allow rwx tag rgw *=*']) @@ -140,7 +140,7 @@ class NFSService(CephService): daemon_id: str = daemon.daemon_id entity: AuthEntity = self.get_auth_entity(f'{daemon_id}-rgw') - logger.info(f'Remove keyring: {entity}') + logger.info(f'Removing key for {entity}') ret, out, err = self.mgr.check_mon_command({ 'prefix': 'auth rm', 'entity': entity, -- 2.39.5