zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -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

4
awx/main/tasks.py
View File

@@ -550,8 +550,8 @@ class BaseTask(Task):
return env return env
def add_tower_venv(self, env): def add_tower_venv(self, env):
env['VIRTUAL_ENV'] = settings.TOWER_VENV_PATH env['VIRTUAL_ENV'] = settings.AWX_VENV_PATH
env['PATH'] = os.path.join(settings.TOWER_VENV_PATH, "bin") + ":" + env['PATH'] env['PATH'] = os.path.join(settings.AWX_VENV_PATH, "bin") + ":" + env['PATH']
return env return env
def build_env(self, instance, **kwargs): def build_env(self, instance, **kwargs):

2
awx/main/utils/common.py
View File

@@ -695,7 +695,7 @@ def wrap_args_with_proot(args, cwd, **kwargs):
show_paths = [cwd, kwargs['private_data_dir']] show_paths = [cwd, kwargs['private_data_dir']]
else: else:
show_paths = [cwd] 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 []) show_paths.extend(getattr(settings, 'AWX_PROOT_SHOW_PATHS', None) or [])
for path in sorted(set(show_paths)): for path in sorted(set(show_paths)):
if not os.path.exists(path): if not os.path.exists(path):

2
awx/settings/development.py
View File

@@ -110,7 +110,7 @@ include(optional('/etc/tower/settings.py'), scope=locals())
include(optional('/etc/tower/conf.d/*.py'), scope=locals()) include(optional('/etc/tower/conf.d/*.py'), scope=locals())
ANSIBLE_VENV_PATH = "/venv/ansible" ANSIBLE_VENV_PATH = "/venv/ansible"
TOWER_VENV_PATH = "/venv/awx" AWX_VENV_PATH = "/venv/awx"
# If any local_*.py files are present in awx/settings/, use them to override # If any local_*.py files are present in awx/settings/, use them to override
# default settings for development. If not present, we can still run using # default settings for development. If not present, we can still run using

2
awx/settings/production.py
View File

@@ -46,7 +46,7 @@ SCHEDULE_METADATA_LOCATION = '/var/lib/awx/.tower_cycle'
ANSIBLE_VENV_PATH = "/var/lib/awx/venv/ansible" ANSIBLE_VENV_PATH = "/var/lib/awx/venv/ansible"
# Tower base virtualenv paths and enablement # Tower base virtualenv paths and enablement
TOWER_VENV_PATH = "/var/lib/awx/venv/awx" AWX_VENV_PATH = "/var/lib/awx/venv/awx"
AWX_ISOLATED_USERNAME = 'awx' AWX_ISOLATED_USERNAME = 'awx'

2
tox.ini
View File

@@ -17,7 +17,7 @@ setenv =
HOME = {homedir} HOME = {homedir}
USERPROFILE = {homedir} USERPROFILE = {homedir}
ANSIBLE_VENV_PATH = {toxworkdir} ANSIBLE_VENV_PATH = {toxworkdir}
TOWER_VENV_PATH = {toxworkdir} AWX_VENV_PATH = {toxworkdir}
SKIP_SLOW_TESTS = True SKIP_SLOW_TESTS = True
[testenv:api-lint] [testenv:api-lint]