From a40c96d793fb22df8f17a4463c5ef5a9e5fa818f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 17 Mar 2021 14:42:34 -0400 Subject: [PATCH] mgr/cephadm: fix --force remove comment Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/serve.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index 4543d872b99..c442f3092a4 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -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(