From e9dabdab6540d949bd3401fef66ec583368b33de Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 5 Aug 2021 10:17:40 -0400 Subject: [PATCH] mgr/cephadm: drop daemon_id arg to CephadmService.config() Unused (and nonsensical since this is *service* config). Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 2 +- src/pybind/mgr/cephadm/serve.py | 2 +- src/pybind/mgr/cephadm/services/cephadmservice.py | 6 +++--- src/pybind/mgr/cephadm/services/iscsi.py | 2 +- src/pybind/mgr/cephadm/services/nfs.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index a06f57512def0..2c8156a865c19 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -2240,7 +2240,7 @@ Then run the following: forcename=name) if not did_config: - self.cephadm_services[service_type].config(spec, daemon_id) + self.cephadm_services[service_type].config(spec) did_config = True daemon_spec = self.cephadm_services[service_type].make_daemon_spec( diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index b36d24c991d8b..3f78af74d5286 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -794,7 +794,7 @@ class CephadmServe: # deploy new daemon daemon_id = slot.name if not did_config: - svc.config(spec, daemon_id) + svc.config(spec) did_config = True daemon_spec = svc.make_daemon_spec( diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index 96e459c70a7e7..81fae8efedcc2 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -188,7 +188,7 @@ class CephadmService(metaclass=ABCMeta): def generate_config(self, daemon_spec: CephadmDaemonDeploySpec) -> Tuple[Dict[str, Any], List[str]]: raise NotImplementedError() - def config(self, spec: ServiceSpec, daemon_id: str) -> None: + def config(self, spec: ServiceSpec) -> None: """ Configure the cluster for this service. Only called *once* per service apply. Not for every daemon. @@ -701,7 +701,7 @@ class MdsService(CephService): def allow_colo(self) -> bool: return True - def config(self, spec: ServiceSpec, daemon_id: str) -> None: + def config(self, spec: ServiceSpec) -> None: assert self.TYPE == spec.service_type assert spec.service_id @@ -757,7 +757,7 @@ class RgwService(CephService): def allow_colo(self) -> bool: return True - def config(self, spec: RGWSpec, rgw_id: str) -> None: # type: ignore + def config(self, spec: RGWSpec) -> None: # type: ignore assert self.TYPE == spec.service_type # set rgw_realm and rgw_zone, if present diff --git a/src/pybind/mgr/cephadm/services/iscsi.py b/src/pybind/mgr/cephadm/services/iscsi.py index 3dd367b152862..3eecb07e94397 100644 --- a/src/pybind/mgr/cephadm/services/iscsi.py +++ b/src/pybind/mgr/cephadm/services/iscsi.py @@ -18,7 +18,7 @@ logger = logging.getLogger(__name__) class IscsiService(CephService): TYPE = 'iscsi' - def config(self, spec: IscsiServiceSpec, daemon_id: str) -> None: # type: ignore + def config(self, spec: IscsiServiceSpec) -> None: # type: ignore assert self.TYPE == spec.service_type assert spec.pool self.mgr._check_pool_exists(spec.pool, spec.service_name()) diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py index 21867cf8fa202..09c1da32932a8 100644 --- a/src/pybind/mgr/cephadm/services/nfs.py +++ b/src/pybind/mgr/cephadm/services/nfs.py @@ -55,7 +55,7 @@ class NFSService(CephService): del rank_map[rank][gen] self.mgr.spec_store.save_rank_map(spec.service_name(), rank_map) - def config(self, spec: NFSServiceSpec, daemon_id: str) -> None: # type: ignore + def config(self, spec: NFSServiceSpec) -> None: # type: ignore from nfs.cluster import create_ganesha_pool assert self.TYPE == spec.service_type -- 2.39.5