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

Merge pull request #11431 from jbradberry/receptor-mesh-models

Browse Source 
Modify Instance and introduce InstanceLink
This commit is contained in:
Jeff Bradberry
2022-01-11 10:55:54 -05:00
committed by GitHub
parent c92468062d 9c9c1b4d3b
commit db999b82ed
19 changed files with 210 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/settings/defaults.py
View File

@@ -262,10 +262,6 @@ CSRF_COOKIE_SECURE = True
# Limit CSRF cookies to browser sessions
CSRF_COOKIE_AGE = None
# Auto-discover new instances that appear on receptor mesh
# used for docker-compose environment, unsupported
MESH_AUTODISCOVERY_ENABLED = False
TEMPLATES = [
{
'NAME': 'default',

3
awx/settings/development.py
View File

@@ -55,9 +55,6 @@ template['OPTIONS']['loaders'] = ('django.template.loaders.filesystem.Loader', '
PENDO_TRACKING_STATE = "off"
INSIGHTS_TRACKING_STATE = False
# auto-discover receptor-* execution nodes
MESH_AUTODISCOVERY_ENABLED = True
# debug toolbar and swagger assume that requirements/requirements_dev.txt are installed
INSTALLED_APPS += ['rest_framework_swagger', 'debug_toolbar'] # NOQA