mgr/cephadm: do not reconfigure daemons on deleted services

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 444663b740da4e91cdf318f2661fc5cc0b76557c)

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index f4499cba07d29588ed5e9df07f8a286d9b94552d..da62716eacd970d9f83d74088aff03c043d4e7fd 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -840,6 +840,10 @@ class CephadmServe:
             if spec and spec.unmanaged:
                 continue
 
+            # ignore daemons for deleted services
+            if dd.service_name() in self.mgr.spec_store.spec_deleted:
+                continue
+
             # These daemon types require additional configs after creation
             if dd.daemon_type in ['grafana', 'iscsi', 'prometheus', 'alertmanager', 'nfs']:
                 daemons_post[dd.daemon_type].append(dd)