]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33973 into octopus
authorSage Weil <sage@redhat.com>
Mon, 16 Mar 2020 02:01:07 +0000 (21:01 -0500)
committerSage Weil <sage@redhat.com>
Mon, 16 Mar 2020 02:01:07 +0000 (21:01 -0500)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/test_orchestrator/module.py

Simple merge
index c8db5b7ae1f803e6ee60004f83d614ecddbd7383,2d8d859c65753f85c312b90a7c92c763f0ddcd13..10fa8482e6ba66a8746d90827f104deec7160dfa
@@@ -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")