From cb076017b14d8851b8e0590913622e67b2570d83 Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Thu, 10 Nov 2022 14:05:57 +0100 Subject: [PATCH] mgr/cephadm: fix prometheus haproxy/ingress deps update Fixes: https://tracker.ceph.com/issues/58001 Signed-off-by: Redouane Kachach --- src/pybind/mgr/cephadm/module.py | 4 +++- src/pybind/mgr/cephadm/services/monitoring.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index b86a00d6fca..3b74ed49eed 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -2508,7 +2508,9 @@ Then run the following: # an explicit dependency is added for each service-type to force a reconfig # whenever the number of daemons for those service-type changes from 0 to greater # than zero and vice versa. - deps += [s for s in ['node-exporter', 'alertmanager', 'ingress'] if self.cache.get_daemons_by_service(s)] + deps += [s for s in ['node-exporter', 'alertmanager'] if self.cache.get_daemons_by_service(s)] + if len(self.cache.get_daemons_by_type('ingress')) > 0: + deps.append('ingress') # add dependency on ceph-exporter daemons deps += [d.name() for d in self.cache.get_daemons_by_service('ceph-exporter')] else: diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py index 89f59ad6548..7522f5bcc13 100644 --- a/src/pybind/mgr/cephadm/services/monitoring.py +++ b/src/pybind/mgr/cephadm/services/monitoring.py @@ -415,8 +415,9 @@ class PrometheusService(CephadmService): deps.append(self.mgr.get_active_mgr().name()) # add dependency on ceph-exporter daemons deps += [d.name() for d in self.mgr.cache.get_daemons_by_service('ceph-exporter')] - deps += [s for s in ['node-exporter', 'alertmanager', 'ingress'] - if self.mgr.cache.get_daemons_by_service(s)] + deps += [s for s in ['node-exporter', 'alertmanager'] if self.mgr.cache.get_daemons_by_service(s)] + if len(self.mgr.cache.get_daemons_by_type('ingress')) > 0: + deps.append('ingress') return deps def get_active_daemon(self, daemon_descrs: List[DaemonDescription]) -> DaemonDescription: -- 2.39.5