From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Nov 2019 14:02:01 +0000 (-0600)
Subject: mgr/ssh: fix remove_mds exception
X-Git-Tag: v15.1.0~1055^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e019f5fe58d48d8a5c267937c565c121c956d9dd;p=ceph-ci.git

mgr/ssh: fix remove_mds exception

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index 1929fbd234e..76dfc02d62d 100644
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -958,7 +958,7 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
                 results.append(self._worker_pool.apply_async(
                     self._remove_mds, (d.service_instance, d.nodename)))
         if not results:
-            raise RuntimeError('Unable to find mds.%s[-*] daemon(s)' % name)
+            raise OrchestratorError('Unable to find mds.%s[-*] daemon(s)' % name)
         return SSHWriteCompletion(results)
 
     def _remove_mds(self, mds_id, host):