Merge PR #31613 into master

* refs/pull/31613/head:
	mgr/ssh: fix redeploy

Reviewed-by: Michael Fritch <mfritch@suse.com>

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

diff --cc src/pybind/mgr/ssh/module.py
index 2e1686645c0d6c5371786620933f78dab87111a2,2489215b8ea74b72c8080d8984c8dcb5fdc51b95..4b9d83f8fd6a69271688fe6f213e3885460cc04e
--- 1/src/pybind/mgr/ssh/module.py
--- 2/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@@ -10,9 -10,9 +10,10 @@@ import rando
  import tempfile
  import multiprocessing.pool
  
 +from ceph.deployment import inventory
  from mgr_module import MgrModule
  import orchestrator
+ from orchestrator import OrchestratorError
  
  from . import remotes