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

Merge pull request #6640 from ryanpetrello/remove_use_venv

Browse Source 
remove ANSIBLE_USE_VENV and TOWER_USE_VENV
This commit is contained in:
Ryan Petrello
2017-06-28 10:22:09 -04:00
committed by GitHub
parent 79e71d77a1 2e608f4eac
commit bd3bfbe1d1
6 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/settings/development.py
View File

@@ -106,9 +106,7 @@ for setting in dir(this_module):
include(optional('/etc/tower/settings.py'), scope=locals())
include(optional('/etc/tower/conf.d/*.py'), scope=locals())
ANSIBLE_USE_VENV = True
ANSIBLE_VENV_PATH = "/venv/ansible"
TOWER_USE_VENV = True
TOWER_VENV_PATH = "/venv/tower"
# If any local_*.py files are present in awx/settings/, use them to override

2
awx/settings/production.py
View File

@@ -43,11 +43,9 @@ JOBOUTPUT_ROOT = '/var/lib/awx/job_status/'
SCHEDULE_METADATA_LOCATION = '/var/lib/awx/.tower_cycle'
# Ansible base virtualenv paths and enablement
ANSIBLE_USE_VENV = True
ANSIBLE_VENV_PATH = "/var/lib/awx/venv/ansible"
# Tower base virtualenv paths and enablement
TOWER_USE_VENV = True
TOWER_VENV_PATH = "/var/lib/awx/venv/tower"
AWX_ISOLATED_USERNAME = 'awx'