]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: fix --force remove comment
authorSage Weil <sage@newdream.net>
Wed, 17 Mar 2021 18:42:34 +0000 (14:42 -0400)
committerSage Weil <sage@newdream.net>
Fri, 19 Mar 2021 14:00:22 +0000 (09:00 -0500)
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit a40c96d793fb22df8f17a4463c5ef5a9e5fa818f)

src/pybind/mgr/cephadm/serve.py

index 4543d872b9965b13f6d3ac897e5b5700d34a4066..c442f3092a42d74b1c75a21742888bb1e45bee0c 100644 (file)
@@ -642,8 +642,6 @@ class CephadmServe:
             daemons_to_remove.pop()
         for d in daemons_to_remove:
             r = True
-            # NOTE: we are passing the 'force' flag here, which means
-            # we can delete a mon instances data.
             assert d.hostname is not None
             self._remove_daemon(d.name(), d.hostname)
 
@@ -919,6 +917,8 @@ class CephadmServe:
 
             self.mgr.cephadm_services[daemon_type_to_service(daemon_type)].pre_remove(daemon)
 
+            # NOTE: we are passing the 'force' flag here, which means
+            # we can delete a mon instances data.
             args = ['--name', name, '--force']
             self.log.info('Removing daemon %s from %s' % (name, host))
             out, err, code = self._run_cephadm(