Merge pull request #6640 from ryanpetrello/remove_use_venv

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
6 changed files with 19 additions and 32 deletions

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