mgr/cephadm: do not remove service spec when removing a daemon

This makes our behavior similar to kube: if you kill a pod, the operator
or controller will come along and create a new one (probably somewhere
else).

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 13b7de454c8db9b35f72bdcf8ab689a4f94145bf..9c4c4709c163e7ba29155b9d6343b33a8290d1c7 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1710,10 +1710,6 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             for name in names:
                 if name in dm:
                     args.append((name, host, force))
-                    # TODO: bail out for OSDs when https://github.com/ceph/ceph/pull/32983 is merged
-                    if dm[name].daemon_type == 'osd':
-                        continue
-                    self._remove_key_from_store(dm[name].service_name())
         if not args:
             raise OrchestratorError('Unable to find daemon(s) %s' % (names))
         self.log.info('Remove daemons %s' % [a[0] for a in args])