From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 26 Mar 2020 12:51:19 +0000 (+0100)
Subject: mgr/cephadm: Set SSH connection timeout to 30s
X-Git-Tag: v15.2.2~76^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f91cc9a25903970bffb69f432f3cb36b75f17f3;p=ceph.git

mgr/cephadm: Set SSH connection timeout to 30s

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 152b4b4b298bb7f2f79159a49a4f75dfa9b739c7)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 184ce95d99d6..d7b6b0f76509 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -60,10 +60,13 @@ except ImportError:
 
 logger = logging.getLogger(__name__)
 
-DEFAULT_SSH_CONFIG = ('Host *\n'
-                      'User root\n'
-                      'StrictHostKeyChecking no\n'
-                      'UserKnownHostsFile /dev/null\n')
+DEFAULT_SSH_CONFIG = """
+Host *
+  User root
+  StrictHostKeyChecking no
+  UserKnownHostsFile /dev/null
+  ConnectTimeout=30
+"""
 
 DATEFMT = '%Y-%m-%dT%H:%M:%S.%f'
 CEPH_DATEFMT = '%Y-%m-%dT%H:%M:%S.%fZ'