performa/os-faults
Code Issues Proposed changes

Add ConnectTimeout=60 to default ssh args

Browse Source 
Sometimes after reverting commands are hang for a long time.
This option interrupts connection initialization if remote server
doesn't reply.

Change-Id: I9909549955f7c05de1746d5968fa73d2bb339961
This commit is contained in:
Georgy Dyuldin 2017-03-03 16:38:08 +03:00
parent bbf5943ea5
commit b8bc50c74a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os_faults/ansible/executor.py
View File

@ -34,7 +34,9 @@ STATUS_SKIPPED = 'SKIPPED'
DEFAULT_ERROR_STATUSES = {STATUS_FAILED, STATUS_UNREACHABLE}
SSH_COMMON_ARGS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
SSH_COMMON_ARGS = ('-o UserKnownHostsFile=/dev/null '
'-o StrictHostKeyChecking=no '
'-o ConnectTimeout=60')
STDOUT_LIMIT = 4096 # Symbols count

4
os_faults/tests/unit/ansible/test_executor.py
View File

@ -142,11 +142,13 @@ class AnsibleRunnerTestCase(test.TestCase):
remote_user='root', scp_extra_args=None, sftp_extra_args=None,
ssh_common_args=('-o UserKnownHostsFile=/dev/null '
'-o StrictHostKeyChecking=no '
'-o ConnectTimeout=60 '
'-o ProxyCommand='
'"ssh -i /path/my.key '
'-W %h:%p '
'-o UserKnownHostsFile=/dev/null '
'-o StrictHostKeyChecking=no '
'-o ConnectTimeout=60 '
'root@jhost.com"'),
ssh_extra_args=None, verbosity=100),
dict(conn_pass=None, become_pass=None),
@ -159,11 +161,13 @@ class AnsibleRunnerTestCase(test.TestCase):
remote_user='root', scp_extra_args=None, sftp_extra_args=None,
ssh_common_args=('-o UserKnownHostsFile=/dev/null '
'-o StrictHostKeyChecking=no '
'-o ConnectTimeout=60 '
'-o ProxyCommand='
'"ssh -i /path/my.key '
'-W %h:%p '
'-o UserKnownHostsFile=/dev/null '
'-o StrictHostKeyChecking=no '
'-o ConnectTimeout=60 '
'juser@jhost.com"'),
ssh_extra_args=None, verbosity=100),
dict(conn_pass=None, become_pass=None),