External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-23 16:47:45 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3632 from ryanpetrello/duplicate-playbook-stdout

Browse Source 
don't write playbook stdout to sys.stdout (it's duplicated in log files)

Reviewed-by: awxbot
             https://github.com/awxbot
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-04-05 15:50:17 +00:00
committed by GitHub
parent 161fd9cde0 81fe923577
commit 4095a6c9d4
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
awx/main/tasks.py
View File

@@ -1176,6 +1176,7 @@ class BaseTask(object):
'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), 'pexpect_timeout': getattr(settings, 'PEXPECT_TIMEOUT', 5),
'suppress_ansible_output': True,
**process_isolation_params, **process_isolation_params,
}, },
} }