Merge pull request #42405 from Daniel-Pivonka/cephadm_rm_offline_host

mgr/cephadm: add ability to remove offline host

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/pybind/mgr/cephadm/module.py
index 7f76cbc8987493cb325e57e3f6e9ce110bf4c7f6,0726ecd69a0bce30cc815da981c2191b7469cd30..27d3734e28a0a86bff7d7bfd46b16d5800ba24fc
--- 1/src/pybind/mgr/cephadm/module.py
--- 2/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -1396,10 -1526,10 +1441,10 @@@ Then run the following
  
          self.inventory.rm_host(host)
          self.cache.rm_host(host)
 -        self._reset_con(host)
 +        self.ssh._reset_con(host)
          self.event.set()  # refresh stray health check
          self.log.info('Removed host %s' % host)
-         return "Removed host '{}'".format(host)
+         return "Removed {} host '{}'".format('offline' if offline else '', host)
  
      @handle_orch_error
      def update_host_addr(self, host: str, addr: str) -> str:

diff --cc src/pybind/mgr/orchestrator/_interface.py
Simple merge

diff --cc src/pybind/mgr/orchestrator/module.py
Simple merge