External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-05 01:59:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6979 from wenottingham/nobody-pexpects-a-timeout-inquisition

Browse Source 
Remove pexpect_timeout setting for ansible-runner

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-05-11 15:33:07 +00:00
committed by GitHub
parent 6b8359fc2f 8cdffd0dd0
commit 1ca3d1fe3b
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

@@ -1416,7 +1416,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,