Merge pull request #67227 from rhcs-dashboard/isolate-cherrypy

mgr: isolated CherryPy to prevent global state sharing

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Ankush Behl <cloudbehl@gmail.com>

diff --cc src/pybind/mgr/cephadm/agent.py
index e6aafce4c78d66f3b3e6a803bd5255a197f5f960,e95f368a909a0681af9cc4dccf1a480856fabf8b..50cca83a9eb90db014706aca533291a871ffe0ae
--- 1/src/pybind/mgr/cephadm/agent.py
--- 2/src/pybind/mgr/cephadm/agent.py
+++ b/src/pybind/mgr/cephadm/agent.py
@@@ -25,10 -17,9 +17,10 @@@ import tempfil
  from cephadm.services.service_registry import service_registry
  from cephadm.services.cephadmservice import CephadmAgent
  from cephadm.tlsobject_types import TLSCredentials
 +from cephadm.utils import get_node_proxy_status_value
  
  from urllib.error import HTTPError, URLError
- from typing import Any, Dict, List, Set, TYPE_CHECKING, Optional, MutableMapping, IO
+ from typing import Any, Dict, List, Set, TYPE_CHECKING, Optional, MutableMapping, IO, Tuple
  
  if TYPE_CHECKING:
      from cephadm.module import CephadmOrchestrator

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

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