]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: Set SSH connection timeout to 30s
authorSebastian Wagner <sebastian.wagner@suse.com>
Thu, 26 Mar 2020 12:51:19 +0000 (13:51 +0100)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 14 Apr 2020 14:50:50 +0000 (16:50 +0200)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 152b4b4b298bb7f2f79159a49a4f75dfa9b739c7)

src/pybind/mgr/cephadm/module.py

index 184ce95d99d6e5daa4d1aaf36910df9c34b3192b..d7b6b0f76509b5a2aee1d43c4187ca8e81e2a2fc 100644 (file)
@@ -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'