External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-28 16:39:56 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'downstream' into devel

Browse Source
This commit is contained in:
Ryan Petrello
2020-05-05 20:12:24 -04:00
parent de8c37fd3d 961c5589c1
commit e7e716742a
10 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/settings/development.py
View File

@@ -148,6 +148,9 @@ for setting in dir(this_module):
include(optional('/etc/tower/settings.py'), scope=locals())
include(optional('/etc/tower/conf.d/*.py'), scope=locals())
# Installed differently in Dockerfile compared to production versions
INVENTORY_COLLECTIONS_ROOT = '/vendor/inventory_collections'
BASE_VENV_PATH = "/venv/"
ANSIBLE_VENV_PATH = os.path.join(BASE_VENV_PATH, "ansible")
AWX_VENV_PATH = os.path.join(BASE_VENV_PATH, "awx")

2
awx/settings/local_settings.py.docker_compose
View File

@@ -53,7 +53,7 @@ if "pytest" in sys.modules:
PROJECTS_ROOT = '/var/lib/awx/projects/'
# Location for cross-development of inventory plugins
# INVENTORY_COLLECTIONS_ROOT = '/awx_devel/awx/plugins/collections'
INVENTORY_COLLECTIONS_ROOT = '/vendor/inventory_collections'
# Absolute filesystem path to the directory for job status stdout
# This directory should not be web-accessible