From: Sage Weil <sage@redhat.com>
Date: Fri, 28 Feb 2020 21:32:04 +0000 (-0600)
Subject: mgr/cephadm: do not remove service spec when removing a daemon
X-Git-Tag: v15.1.1~191^2~12
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f44c11d1a5297c12c3b82874fbd9d7c8243a40a2;p=ceph-ci.git

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 13b7de454c8..9c4c4709c16 100644
--- 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])