catch ClientInitException at cli.py (for now)

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>

diff --git a/ceph_deploy/cli.py b/ceph_deploy/cli.py
index a2a40cdc4ec0ce2aa95ba175e394bab01c82565e..003ef3bf0ead7d839d130a4ee456bddcf40d4158 100644 (file)
--- a/ceph_deploy/cli.py
+++ b/ceph_deploy/cli.py
@@ -9,6 +9,7 @@ import ceph_deploy
 from . import exc
 from . import validate
 from . import sudo_pushy
+from pushy.client import ClientInitException
 from .util import log
 from .util.decorators import catches
 
@@ -99,7 +100,13 @@ def get_parser():
     return parser
 
 
-@catches((KeyboardInterrupt, RuntimeError, exc.DeployError))
+# TODO: Move the ClientInitException to hosts.get once all actions are using
+# hosts.get() to start the remote connection
+@catches((
+    KeyboardInterrupt,
+    RuntimeError,
+    exc.DeployError,
+    ClientInitException))
 def main(args=None, namespace=None):
     parser = get_parser()