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

add TODO reminders to remove proot / venv code

Browse Source 
* won't be needed once we move to container-based
  execution
This commit is contained in:
Jim Ladd
2020-11-03 13:00:39 -08:00
committed by Alan Rominger
parent 12cbc9756b
commit 277c47ba4e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/tasks.py
View File

@@ -2461,12 +2461,14 @@ class RunInventoryUpdate(BaseTask):
event_model = InventoryUpdateEvent event_model = InventoryUpdateEvent
event_data_key = 'inventory_update_id' event_data_key = 'inventory_update_id'
# TODO: remove once inv updates run in containers
def should_use_proot(self, inventory_update): def should_use_proot(self, inventory_update):
''' '''
Return whether this task should use proot. Return whether this task should use proot.
''' '''
return getattr(settings, 'AWX_PROOT_ENABLED', False) return getattr(settings, 'AWX_PROOT_ENABLED', False)
# TODO: remove once inv updates run in containers
@property @property
def proot_show_paths(self): def proot_show_paths(self):
return [settings.AWX_ANSIBLE_COLLECTIONS_PATHS] return [settings.AWX_ANSIBLE_COLLECTIONS_PATHS]
@@ -2503,6 +2505,7 @@ class RunInventoryUpdate(BaseTask):
private_data_files=private_data_files) private_data_files=private_data_files)
if private_data_files is None: if private_data_files is None:
private_data_files = {} private_data_files = {}
# TODO: remove once containers replace custom venvs
self.add_ansible_venv(inventory_update.ansible_virtualenv_path, env, isolated=isolated) self.add_ansible_venv(inventory_update.ansible_virtualenv_path, env, isolated=isolated)
# Legacy environment variables, were used as signal to awx-manage command # Legacy environment variables, were used as signal to awx-manage command