From a39cd41b7cddddbe011400144e5303e7cc4b175b Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Mon, 27 Apr 2020 11:42:26 -0600 Subject: [PATCH] mgr/cephadm: use keyword instead of positional args Signed-off-by: Michael Fritch (cherry picked from commit 7efa0a6fdadcafb4df0cd1068f7b8482ebae0ce5) --- src/pybind/mgr/cephadm/module.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 0edd76de4e39b..d8237588bbba6 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -2464,7 +2464,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): config_func(spec) did_config = True daemon_id = self.get_unique_name(daemon_type, host, daemons, - spec.service_id, name) + prefix=spec.service_id, + forcename=name) self.log.debug('Placing %s.%s on host %s' % ( daemon_type, daemon_id, host)) if daemon_type == 'mon': @@ -2610,7 +2611,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): args = [] # type: List[tuple] for host, network, name in hosts: daemon_id = self.get_unique_name(daemon_type, host, daemons, - spec.service_id, name) + prefix=spec.service_id, + forcename=name) self.log.debug('Placing %s.%s on host %s' % ( daemon_type, daemon_id, host)) if daemon_type == 'mon': -- 2.39.5