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

Merge pull request #3519 from chrismeyersfsu/fix-iso_bwrap

Browse Source 
runner expects process isolation flags in settings

Reviewed-by: awxbot
             https://github.com/awxbot
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-03-27 15:49:24 +00:00
committed by GitHub
parent 055e7b4974 2329079326
commit f715e4e410
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@@ -1162,8 +1162,8 @@ class BaseTask(object):
'idle_timeout': self.get_idle_timeout() or "", 'idle_timeout': self.get_idle_timeout() or "",
'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),
**process_isolation_params,
}, },
**process_isolation_params,
} }
if isinstance(self.instance, AdHocCommand): if isinstance(self.instance, AdHocCommand):