From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Mar 2020 02:01:07 +0000 (-0500)
Subject: Merge PR #33973 into octopus
X-Git-Tag: v15.2.0~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=334dede19883a5b99b2d65bfce037d360518d9f0;p=ceph-ci.git

Merge PR #33973 into octopus

* refs/pull/33973/head:
	mgr/orch,cephadm: elevate --force flag for daemons to interface
	cephadm: backup data when we remove stateful daemons (mon, osd, prometheus)
	cephadm: do not zap disk after removing an OSD daemon

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

334dede19883a5b99b2d65bfce037d360518d9f0
diff --cc src/pybind/mgr/test_orchestrator/module.py
index c8db5b7ae1f,2d8d859c657..10fa8482e6b
--- a/src/pybind/mgr/test_orchestrator/module.py
+++ b/src/pybind/mgr/test_orchestrator/module.py
@@@ -272,10 -272,10 +272,10 @@@ class TestOrchestrator(MgrModule, orche
                  message='apply_drivesgroups',
                  mgr=self,
              )
 -        )
 +        )]
  
      @deferred_write("remove_daemons")
-     def remove_daemons(self, names, force):
+     def remove_daemons(self, names):
          assert isinstance(names, list)
  
      @deferred_write("remove_service")