From 8cdffd0dd04a52192ecc92121b554e8b0ecf1308 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 8 May 2020 16:31:11 -0400 Subject: [PATCH] Remove pexpect_timeout setting for ansible-runner PEXPECT_TIMEOUT has never(?) been an actual setting, and 5 is the runner default anyway. --- awx/main/isolated/manager.py | 1 - awx/main/tasks.py | 1 - 2 files changed, 2 deletions(-) diff --git a/awx/main/isolated/manager.py b/awx/main/isolated/manager.py index 910f1ac0c6..d9f4e4d3e7 100644 --- a/awx/main/isolated/manager.py +++ b/awx/main/isolated/manager.py @@ -109,7 +109,6 @@ class IsolatedManager(object): 'cancel_callback': self.canceled_callback, 'settings': { 'job_timeout': settings.AWX_ISOLATED_LAUNCH_TIMEOUT, - 'pexpect_timeout': getattr(settings, 'PEXPECT_TIMEOUT', 5), 'suppress_ansible_output': True, }, } diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 32a125aad6..ab950ea159 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1423,7 +1423,6 @@ class BaseTask(object): 'status_handler': self.status_handler, 'settings': { 'job_timeout': self.get_instance_timeout(self.instance), - 'pexpect_timeout': getattr(settings, 'PEXPECT_TIMEOUT', 5), 'suppress_ansible_output': True, **process_isolation_params, **resource_profiling_params,