From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Mar 2020 20:02:06 +0000 (-0600)
Subject: mgr/cephadm: allow _apply_service to delete mon daemon's data
X-Git-Tag: v15.1.1~67^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0dcf03d5ec7a0d16ddd635e22df1748eb465abe;p=ceph.git

mgr/cephadm: allow _apply_service to delete mon daemon's data

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 07796619a30e..62ff645e012b 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -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