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

Merge pull request #5464 from ryanpetrello/iso-check-timeout

Browse Source 
fix a bug in isolated check timeout handling

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-12-06 19:21:08 +00:00
committed by GitHub
parent 01161c7afd 220168f5ee
commit a9e5981cfe
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,6 +126,8 @@ class IsolatedManager(object):
params['private_data_dir'] = iso_dir params['private_data_dir'] = iso_dir
if idle_timeout: if idle_timeout:
params['settings']['idle_timeout'] = idle_timeout params['settings']['idle_timeout'] = idle_timeout
else:
params['settings'].pop('idle_timeout', None)
params.update(**kw) params.update(**kw)
if all([ if all([
getattr(settings, 'AWX_ISOLATED_KEY_GENERATION', False) is True, getattr(settings, 'AWX_ISOLATED_KEY_GENERATION', False) is True,