diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 5b02e694fb..6a7b97a861 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -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): diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index e2d2264045..a3b402a92a 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -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): diff --git a/awx/settings/development.py b/awx/settings/development.py index dcb20566ff..1dc7bb8688 100644 --- a/awx/settings/development.py +++ b/awx/settings/development.py @@ -110,7 +110,7 @@ include(optional('/etc/tower/settings.py'), scope=locals()) include(optional('/etc/tower/conf.d/*.py'), scope=locals()) 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 # default settings for development. If not present, we can still run using diff --git a/awx/settings/production.py b/awx/settings/production.py index 144ec6d5bd..1d93ad43e6 100644 --- a/awx/settings/production.py +++ b/awx/settings/production.py @@ -46,7 +46,7 @@ SCHEDULE_METADATA_LOCATION = '/var/lib/awx/.tower_cycle' ANSIBLE_VENV_PATH = "/var/lib/awx/venv/ansible" # 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' diff --git a/tox.ini b/tox.ini index e29c4c3cf4..53178e1a4b 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ setenv = HOME = {homedir} USERPROFILE = {homedir} ANSIBLE_VENV_PATH = {toxworkdir} - TOWER_VENV_PATH = {toxworkdir} + AWX_VENV_PATH = {toxworkdir} SKIP_SLOW_TESTS = True [testenv:api-lint]