mirror of
https://github.com/ansible/awx.git
synced 2026-01-10 15:32:07 -03:30
Pass ident to "process" cmd and disable stdout file
This requires corresponding ansible-runner changes which are only available in devel branch to do this, requirements are changed to install ansible-runner devel as it did before Revert "Use ansible-runner 2.1.1 build" This reverts commit f0ede010176bd6bfcb45b4fee4194096a91c0003. Add back in change from updater.sh that we want to keep
This commit is contained in:
parent
696c0b0055
commit
eb64fde885
@ -673,6 +673,7 @@ class BaseTask(object):
|
||||
'settings': {
|
||||
'job_timeout': self.get_instance_timeout(self.instance),
|
||||
'suppress_ansible_output': True,
|
||||
'suppress_output_file': True,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user