External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-21 13:10:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

Remove pexpect_timeout setting for ansible-runner

Browse Source 
PEXPECT_TIMEOUT has never(?) been an actual setting, and 5 is the
runner default anyway.
This commit is contained in:
Bill Nottingham
2020-05-08 16:31:11 -04:00
parent 5e02e6e4a4
commit 8cdffd0dd0
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/isolated/manager.py
View File

@@ -109,7 +109,6 @@ class IsolatedManager(object):
'cancel_callback': self.canceled_callback, 'cancel_callback': self.canceled_callback,
'settings': { 'settings': {
'job_timeout': settings.AWX_ISOLATED_LAUNCH_TIMEOUT, 'job_timeout': settings.AWX_ISOLATED_LAUNCH_TIMEOUT,
'pexpect_timeout': getattr(settings, 'PEXPECT_TIMEOUT', 5),
'suppress_ansible_output': True, 'suppress_ansible_output': True,
}, },
} }

1
awx/main/tasks.py
View File

@@ -1423,7 +1423,6 @@ class BaseTask(object):
'status_handler': self.status_handler, 'status_handler': self.status_handler,
'settings': { 'settings': {
'job_timeout': self.get_instance_timeout(self.instance), 'job_timeout': self.get_instance_timeout(self.instance),
'pexpect_timeout': getattr(settings, 'PEXPECT_TIMEOUT', 5),
'suppress_ansible_output': True, 'suppress_ansible_output': True,
**process_isolation_params, **process_isolation_params,
**resource_profiling_params, **resource_profiling_params,