]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: allow _apply_service to delete mon daemon's data
authorSage Weil <sage@redhat.com>
Fri, 6 Mar 2020 20:02:06 +0000 (14:02 -0600)
committerSage Weil <sage@redhat.com>
Sat, 7 Mar 2020 17:22:55 +0000 (11:22 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py

index 07796619a30ee6a8039a582ecf3cb36cb98c9fe6..62ff645e012b7aa956fe8198bb7131b57398b676 100644 (file)
@@ -2244,7 +2244,9 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         target_hosts = [h.hostname for h in hosts]
         for d in daemons:
             if d.hostname not in target_hosts:
-                self._remove_daemon(d.name(), d.hostname)
+                # NOTE: we are passing the 'force' flag here, which means
+                # we can delete a mon instances data.
+                self._remove_daemon(d.name(), d.hostname, True)
                 r = True
 
         return r