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

Merge pull request #1417 from ansible/python27_el6

Browse Source 
EL6 Python 2.7 and Tower virtualenvs
This commit is contained in:
Graham Mainwaring
2016-04-06 10:57:18 -04:00
parent 54a4639c83 057613fa31
commit a6acb5181a
23 changed files with 223 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/utils.py
View File

@@ -487,6 +487,10 @@ def wrap_args_with_proot(args, cwd, **kwargs):
show_paths = [cwd, kwargs['private_data_dir']]
else:
show_paths = [cwd]
if settings.ANSIBLE_USE_VENV:
show_paths.append(settings.ANSIBLE_VENV_PATH)
if settings.TOWER_USE_VENV:
show_paths.append(settings.TOWER_VENV_PATH)
show_paths.extend(getattr(tower_settings, 'AWX_PROOT_SHOW_PATHS', None) or [])
for path in sorted(set(show_paths)):
if not os.path.exists(path):