zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-16 07:48:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

rename setting TOWER_VENV_PATH to AWX_VENV_PATH

Browse Source
This commit is contained in:
AlanCoding
2017-07-24 12:23:54 -04:00
parent 6e3978fe66
commit eaeff7e290
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/tasks.py
+2 -2
View File
@@ -550,8 +550,8 @@ class BaseTask(Task):
return env
def add_tower_venv(self, env):
env['VIRTUAL_ENV'] = settings.TOWER_VENV_PATH
env['PATH'] = os.path.join(settings.TOWER_VENV_PATH, "bin") + ":" + env['PATH']
env['VIRTUAL_ENV'] = settings.AWX_VENV_PATH
env['PATH'] = os.path.join(settings.AWX_VENV_PATH, "bin") + ":" + env['PATH']
return env
def build_env(self, instance, **kwargs):
awx/main/utils/common.py
+1 -1
View File
@@ -695,7 +695,7 @@ def wrap_args_with_proot(args, cwd, **kwargs):
show_paths = [cwd, kwargs['private_data_dir']]
else:
show_paths = [cwd]
show_paths.extend([settings.ANSIBLE_VENV_PATH, settings.TOWER_VENV_PATH])
show_paths.extend([settings.ANSIBLE_VENV_PATH, settings.AWX_VENV_PATH])
show_paths.extend(getattr(settings, 'AWX_PROOT_SHOW_PATHS', None) or [])
for path in sorted(set(show_paths)):
if not os.path.exists(path):