diff --git a/os_faults/ansible/executor.py b/os_faults/ansible/executor.py index 53c8dd1..bfd25b7 100644 --- a/os_faults/ansible/executor.py +++ b/os_faults/ansible/executor.py @@ -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 diff --git a/os_faults/tests/unit/ansible/test_executor.py b/os_faults/tests/unit/ansible/test_executor.py index 2615505..4545887 100644 --- a/os_faults/tests/unit/ansible/test_executor.py +++ b/os_faults/tests/unit/ansible/test_executor.py @@ -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),