External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 05:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Initial EE integration

Browse Source
This commit is contained in:
Shane McDonald
2020-07-31 09:43:46 -04:00
parent acee22435b
commit 521d3d5edb
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/tasks.py
View File

@@ -1430,10 +1430,6 @@ class BaseTask(object):
cwd = self.build_cwd(self.instance, private_data_dir) cwd = self.build_cwd(self.instance, private_data_dir)
resource_profiling_params = self.build_params_resource_profiling(self.instance, resource_profiling_params = self.build_params_resource_profiling(self.instance,
private_data_dir) private_data_dir)
# TODO: Remove if fully replaced with containerized runs
# process_isolation_params = self.build_params_process_isolation(self.instance,
# private_data_dir,
# cwd)
execution_environment_params = self.build_execution_environment_params(self.instance) execution_environment_params = self.build_execution_environment_params(self.instance)
env = self.build_env(self.instance, private_data_dir, isolated, env = self.build_env(self.instance, private_data_dir, isolated,
private_data_files=private_data_files) private_data_files=private_data_files)
@@ -1469,7 +1465,6 @@ class BaseTask(object):
'settings': { 'settings': {
'job_timeout': self.get_instance_timeout(self.instance), 'job_timeout': self.get_instance_timeout(self.instance),
'suppress_ansible_output': True, 'suppress_ansible_output': True,
#**process_isolation_params,
**resource_profiling_params, **resource_profiling_params,
}, },
} }