From e6036bc53383146c929d9919f9d1c8176787f80c Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Tue, 10 Mar 2026 17:17:35 -0400 Subject: [PATCH] mgr/cephadm: remove unused manages_own_next_action attribute Signed-off-by: John Mulligan --- src/pybind/mgr/cephadm/services/cephadmservice.py | 7 ------- src/pybind/mgr/cephadm/services/ingress.py | 2 -- src/pybind/mgr/cephadm/services/jaeger.py | 2 -- src/pybind/mgr/cephadm/services/monitoring.py | 6 ------ src/pybind/mgr/cephadm/services/nfs.py | 2 -- 5 files changed, 19 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index ee07a5565af3..fd0190f2f314 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -886,11 +886,6 @@ class CephadmService(metaclass=ABCMeta): def has_placement_changed(self, deps: List[str], spec: ServiceSpec) -> bool: return False - # manages_own_next_action allows the CephadmService subclasses - # to incrementally support using choose_next_action instead of - # "hard coded" blocks in the _check_daemons function. - manages_own_next_action = False - def choose_next_action( self, scheduled_action: utils.Action, @@ -1790,8 +1785,6 @@ class CephExporterService(CephService): return daemon_spec - manages_own_next_action = True - def choose_next_action( self, scheduled_action: utils.Action, diff --git a/src/pybind/mgr/cephadm/services/ingress.py b/src/pybind/mgr/cephadm/services/ingress.py index 3d98933d814d..58d3d7af72ad 100644 --- a/src/pybind/mgr/cephadm/services/ingress.py +++ b/src/pybind/mgr/cephadm/services/ingress.py @@ -549,8 +549,6 @@ class IngressService(CephService): return True return False - manages_own_next_action = True - def choose_next_action( self, scheduled_action: utils.Action, diff --git a/src/pybind/mgr/cephadm/services/jaeger.py b/src/pybind/mgr/cephadm/services/jaeger.py index c8bb3565db8b..1d60680cc0f8 100644 --- a/src/pybind/mgr/cephadm/services/jaeger.py +++ b/src/pybind/mgr/cephadm/services/jaeger.py @@ -50,8 +50,6 @@ class JaegerAgentService(CephadmService): daemon_spec.deps = self.get_dependencies(self.mgr) return daemon_spec - manages_own_next_action = True - def choose_next_action( self, scheduled_action: utils.Action, diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py index b36e2071ee1b..7c50f3f9ae6c 100644 --- a/src/pybind/mgr/cephadm/services/monitoring.py +++ b/src/pybind/mgr/cephadm/services/monitoring.py @@ -477,8 +477,6 @@ class AlertmanagerService(CephadmService): return HandleCommandResult(-errno.EBUSY, '', warn_message) return HandleCommandResult(0, warn_message, '') - manages_own_next_action = True - def choose_next_action( self, scheduled_action: utils.Action, @@ -780,8 +778,6 @@ class PrometheusService(CephadmService): return '/federate' return '/prometheus/federate' - manages_own_next_action = True - def choose_next_action( self, scheduled_action: utils.Action, @@ -849,8 +845,6 @@ class NodeExporterService(CephadmService): out = f'It is presumed safe to stop {names}' return HandleCommandResult(0, out, '') - manages_own_next_action = True - def choose_next_action( self, scheduled_action: utils.Action, diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py index e888876a6666..063c736f66ae 100644 --- a/src/pybind/mgr/cephadm/services/nfs.py +++ b/src/pybind/mgr/cephadm/services/nfs.py @@ -436,8 +436,6 @@ class NFSService(CephService): logger.debug(f"No IP address found in the network {spec.monitoring_networks} on host {host}.") return monitoring_addr, monitoring_port - manages_own_next_action = True - def choose_next_action( self, scheduled_action: utils.Action, -- 2.47.3