From: Sage Weil <sage@redhat.com>
Date: Wed, 13 Nov 2019 18:59:57 +0000 (-0600)
Subject: Merge PR #31613 into master
X-Git-Tag: v15.1.0~909
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c24c2de0e9e761c0bd0abb9d0c1eb0c0f57912e;p=ceph.git

Merge PR #31613 into master

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

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

3c24c2de0e9e761c0bd0abb9d0c1eb0c0f57912e
diff --cc src/pybind/mgr/ssh/module.py
index 2e1686645c0d,2489215b8ea7..4b9d83f8fd6a
--- a/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