diff --git a/awx/main/tasks/jobs.py b/awx/main/tasks/jobs.py index c1a5baf363..80ebdf171d 100644 --- a/awx/main/tasks/jobs.py +++ b/awx/main/tasks/jobs.py @@ -673,6 +673,7 @@ class BaseTask(object): 'settings': { 'job_timeout': self.get_instance_timeout(self.instance), 'suppress_ansible_output': True, + 'suppress_output_file': True, }, } diff --git a/requirements/requirements.in b/requirements/requirements.in index cc8e2941c7..48ae627caf 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -1,5 +1,4 @@ aiohttp -ansible-runner==2.1.1 ansiconv==1.0.0 # UPGRADE BLOCKER: from 2013, consider replacing instead of upgrading asciichartpy autobahn>=20.12.3 # CVE-2020-35678 @@ -61,3 +60,7 @@ uwsgitop wheel pip==21.2.4 # see UPGRADE BLOCKERs setuptools==58.2.0 # see UPGRADE BLOCKERs + +# Temporarily added to use ansible-runner from git branch, to be removed +# when ansible-runner moves from requirements_git.txt to here +pbr diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 6d84bbfc55..637f0dd9e0 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -4,8 +4,7 @@ aiohttp==3.6.2 # via -r /awx_devel/requirements/requirements.in aioredis==1.3.1 # via channels-redis -ansible-runner==2.1.1 - # via -r /awx_devel/requirements/requirements.in + # via -r /awx_devel/requirements/requirements_git.txt ansiconv==1.0.0 # via -r /awx_devel/requirements/requirements.in asciichartpy==1.5.25 @@ -225,6 +224,8 @@ oauthlib==3.1.0 # social-auth-core openshift==0.11.0 # via -r /awx_devel/requirements/requirements.in +pbr==5.6.0 + # via -r /awx_devel/requirements/requirements.in pexpect==4.7.0 # via # -r /awx_devel/requirements/requirements.in diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index 340cbfdcc7..01b668ee18 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -1 +1,3 @@ git+https://github.com/ansible/system-certifi.git@devel#egg=certifi +# Remove pbr from requirements.in when moving ansible-runner to requirements.in +git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner