From 01d920c0fb01769a795197ebd5dc535816182b0f Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Thu, 18 Jun 2020 11:31:22 +0200 Subject: [PATCH] mgr/cephadm: fix broken "already in use" exception message Fixes: ``` orchestrator._interface.OrchestratorValidationError: ('name %s already in use', 'b') ``` Signed-off-by: Sebastian Wagner (cherry picked from commit 9a45c39c68956c87e55ec4cce90a7bb4df524b97) --- src/pybind/mgr/cephadm/module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index b89c2408bb6..d3416ec03ea 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -567,7 +567,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): ] if forcename: if len([d for d in existing if d.daemon_id == forcename]): - raise orchestrator.OrchestratorValidationError('name %s already in use', forcename) + raise orchestrator.OrchestratorValidationError(f'name {daemon_type}.{forcename} already in use') return forcename if '.' in host: @@ -583,7 +583,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): for _ in range(6)) if len([d for d in existing if d.daemon_id == name]): if not suffix: - raise orchestrator.OrchestratorValidationError('name %s already in use', name) + raise orchestrator.OrchestratorValidationError(f'name {daemon_type}.{name} already in use') self.log.debug('name %s exists, trying again', name) continue return name -- 2.47.3