diff --git a/awx/main/tasks/receptor.py b/awx/main/tasks/receptor.py index 24108a9c5705..757319690556 100644 --- a/awx/main/tasks/receptor.py +++ b/awx/main/tasks/receptor.py @@ -639,11 +639,11 @@ def kube_config(self): # RECEPTOR_CONFIG_STARTER = ( {'local-only': None}, - {'log-level': 'info'}, + {'log-level': settings.RECEPTOR_LOG_LEVEL}, {'node': {'firewallrules': [{'action': 'reject', 'tonode': settings.CLUSTER_HOST_ID, 'toservice': 'control'}]}}, {'control-service': {'service': 'control', 'filename': '/var/run/receptor/receptor.sock', 'permissions': '0660'}}, {'work-command': {'worktype': 'local', 'command': 'ansible-runner', 'params': 'worker', 'allowruntimeparams': True}}, - {'work-signing': {'privatekey': '/etc/receptor/signing/work-private-key.pem', 'tokenexpiration': '1m'}}, + {'work-signing': {'privatekey': '/etc/receptor/work_private_key.pem', 'tokenexpiration': '1m'}}, { 'work-kubernetes': { 'worktype': 'kubernetes-runtime-auth', diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 795cb44fe39c..c46e65757201 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -959,6 +959,9 @@ # Delete completed work units in receptor RECEPTOR_RELEASE_WORK = True +# K8S only. Use receptor_log_level on AWX spec to set this properly +RECEPTOR_LOG_LEVEL = 'info' + MIDDLEWARE = [ 'django_guid.middleware.guid_middleware', 'awx.main.middleware.SettingsCacheMiddleware',