Merge pull request #38854 from adk3798/ots-monitoring

mgr/cephadm: force flag for ok-to-stop and ok-to-stop for monitoring stack

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --cc src/pybind/mgr/cephadm/module.py
index 2e88dafe6751101bed6d3cab2c024c8fbc4b50b0,06a5a06efd32deccb511ca58d3c7a483630bab8e..a6ffdb4a037be383e43f5b8c03f58502757cfc60
--- 1/src/pybind/mgr/cephadm/module.py
--- 2/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -1333,15 -1346,16 +1349,16 @@@ class CephadmOrchestrator(orchestrator.
          if host_daemons:
              # daemons on this host, so check the daemons can be stopped
              # and if so, place the host into maintenance by disabling the target
-             rc, msg = self._host_ok_to_stop(hostname)
+             rc, msg = self._host_ok_to_stop(hostname, force)
              if rc:
-                 raise OrchestratorError(msg, errno=rc)
+                 raise OrchestratorError(
+                     msg + '\nNote: Warnings can be bypassed with the --force flag', errno=rc)
  
              # call the host-maintenance function
 -            out, _err, _code = CephadmServe(self)._run_cephadm(hostname, cephadmNoImage, "host-maintenance",
 -                                                               ["enter"],
 -                                                               error_ok=True)
 -            if out:
 +            _out, _err, _code = CephadmServe(self)._run_cephadm(hostname, cephadmNoImage, "host-maintenance",
 +                                                                ["enter"],
 +                                                                error_ok=True)
 +            if _out:
                  raise OrchestratorError(
                      f"Failed to place {hostname} into maintenance for cluster {self._cluster_fsid}")
  

diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge

diff --cc src/pybind/mgr/cephadm/services/cephadmservice.py
Simple merge

diff --cc src/pybind/mgr/cephadm/upgrade.py
Simple merge

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