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

fix a bug in isolated check timeout handling Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
ansible · Dec 6, 2019 · a9e5981 · a9e5981
2 parents 01161c7 + 220168f
commit a9e5981
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/awx/main/isolated/manager.py b/awx/main/isolated/manager.py
@@ -126,6 +126,8 @@ def run_management_playbook(self, playbook, private_data_dir, idle_timeout=None,
         params['private_data_dir'] = iso_dir
         if idle_timeout:
             params['settings']['idle_timeout'] = idle_timeout
+        else:
+            params['settings'].pop('idle_timeout', None)
         params.update(**kw)
         if all([
             getattr(settings, 'AWX_ISOLATED_KEY_GENERATION', False) is True,