mirror of
https://github.com/ansible/awx.git
synced 2026-05-03 15:45:28 -02:30
Merge pull request #940 from ryanpetrello/multivenv
implement support for per-playbook/project/org virtualenvs
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
# Development settings for AWX project.
|
||||
|
||||
# Python
|
||||
import os
|
||||
import socket
|
||||
import copy
|
||||
import sys
|
||||
@@ -123,8 +124,9 @@ for setting in dir(this_module):
|
||||
include(optional('/etc/tower/settings.py'), scope=locals())
|
||||
include(optional('/etc/tower/conf.d/*.py'), scope=locals())
|
||||
|
||||
ANSIBLE_VENV_PATH = "/venv/ansible"
|
||||
AWX_VENV_PATH = "/venv/awx"
|
||||
BASE_VENV_PATH = "/venv/"
|
||||
ANSIBLE_VENV_PATH = os.path.join(BASE_VENV_PATH, "ansible")
|
||||
AWX_VENV_PATH = os.path.join(BASE_VENV_PATH, "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
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
# Production settings for AWX project.
|
||||
|
||||
# Python
|
||||
import os
|
||||
import copy
|
||||
import errno
|
||||
import sys
|
||||
@@ -43,10 +44,11 @@ JOBOUTPUT_ROOT = '/var/lib/awx/job_status/'
|
||||
SCHEDULE_METADATA_LOCATION = '/var/lib/awx/.tower_cycle'
|
||||
|
||||
# Ansible base virtualenv paths and enablement
|
||||
ANSIBLE_VENV_PATH = "/var/lib/awx/venv/ansible"
|
||||
BASE_VENV_PATH = "/var/lib/awx/venv"
|
||||
ANSIBLE_VENV_PATH = os.path.join(BASE_VENV_PATH, "ansible")
|
||||
|
||||
# Tower base virtualenv paths and enablement
|
||||
AWX_VENV_PATH = "/var/lib/awx/venv/awx"
|
||||
AWX_VENV_PATH = os.path.join(BASE_VENV_PATH, "awx")
|
||||
|
||||
AWX_ISOLATED_USERNAME = 'awx'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user