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

Add settings.RECEPTOR_LOG_LEVEL, update work signing key path (#14098)

Browse Source
This commit is contained in:
Seth Foster
2023-07-06 11:39:30 -04:00
committed by GitHub
parent a4f808df34
commit 8b49f910c7
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks/receptor.py
View File

@@ -639,7 +639,7 @@ class AWXReceptorJob:
# #
RECEPTOR_CONFIG_STARTER = ( RECEPTOR_CONFIG_STARTER = (
{'local-only': None}, {'local-only': None},
{'log-level': 'info'}, {'log-level': settings.RECEPTOR_LOG_LEVEL},
{'node': {'firewallrules': [{'action': 'reject', 'tonode': settings.CLUSTER_HOST_ID, 'toservice': 'control'}]}}, {'node': {'firewallrules': [{'action': 'reject', 'tonode': settings.CLUSTER_HOST_ID, 'toservice': 'control'}]}},
{'control-service': {'service': 'control', 'filename': '/var/run/receptor/receptor.sock', 'permissions': '0660'}}, {'control-service': {'service': 'control', 'filename': '/var/run/receptor/receptor.sock', 'permissions': '0660'}},
{'work-command': {'worktype': 'local', 'command': 'ansible-runner', 'params': 'worker', 'allowruntimeparams': True}}, {'work-command': {'worktype': 'local', 'command': 'ansible-runner', 'params': 'worker', 'allowruntimeparams': True}},

3
awx/settings/defaults.py
View File

@@ -964,6 +964,9 @@ AWX_RUNNER_KEEPALIVE_SECONDS = 0
# Delete completed work units in receptor # Delete completed work units in receptor
RECEPTOR_RELEASE_WORK = True RECEPTOR_RELEASE_WORK = True
# K8S only. Use receptor_log_level on AWX spec to set this properly
RECEPTOR_LOG_LEVEL = 'info'
MIDDLEWARE = [ MIDDLEWARE = [
'django_guid.middleware.guid_middleware', 'django_guid.middleware.guid_middleware',
'awx.main.middleware.SettingsCacheMiddleware', 'awx.main.middleware.SettingsCacheMiddleware',