From 822b3a439f8f3ee27c15bce1c082bf788eff0c1e Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Mon, 10 Jul 2023 11:49:58 -0400 Subject: [PATCH] Add receptor_log_level (#1444) --- config/crd/bases/awx.ansible.com_awxs.yaml | 3 +++ .../manifests/bases/awx-operator.clusterserviceversion.yaml | 5 +++++ roles/installer/defaults/main.yml | 2 ++ roles/installer/templates/configmaps/config.yaml.j2 | 5 ++++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/config/crd/bases/awx.ansible.com_awxs.yaml b/config/crd/bases/awx.ansible.com_awxs.yaml index 0fd2967d..62c408b7 100644 --- a/config/crd/bases/awx.ansible.com_awxs.yaml +++ b/config/crd/bases/awx.ansible.com_awxs.yaml @@ -1753,6 +1753,9 @@ spec: session_cookie_secure: description: Set session cookie secure mode for web type: string + receptor_log_level: + description: Set log level of receptor service + type: string extra_settings: description: Extra settings to specify for the API items: diff --git a/config/manifests/bases/awx-operator.clusterserviceversion.yaml b/config/manifests/bases/awx-operator.clusterserviceversion.yaml index 74dc2ae1..a6c57e59 100644 --- a/config/manifests/bases/awx-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/awx-operator.clusterserviceversion.yaml @@ -792,6 +792,11 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:advanced - urn:alm:descriptor:com.tectonic.ui:hidden + - displayName: Receptor Log Level + path: receptor_log_level + x-descriptors: + - urn:alm:descriptor:com.tectonic.ui:advanced + - urn:alm:descriptor:com.tectonic.ui:hidden - displayName: API Extra Settings path: extra_settings x-descriptors: diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml index 01a255bd..f7a541cb 100644 --- a/roles/installer/defaults/main.yml +++ b/roles/installer/defaults/main.yml @@ -447,3 +447,5 @@ ipv6_disabled: false # hostnames: # - hostname host_aliases: '' + +receptor_log_level: info diff --git a/roles/installer/templates/configmaps/config.yaml.j2 b/roles/installer/templates/configmaps/config.yaml.j2 index 42ad308b..4be3c2dc 100644 --- a/roles/installer/templates/configmaps/config.yaml.j2 +++ b/roles/installer/templates/configmaps/config.yaml.j2 @@ -84,6 +84,9 @@ data: BROADCAST_WEBSOCKET_PROTOCOL = 'http' + RECEPTOR_LOG_LEVEL = '{{ receptor_log_level }}' + + {% for item in extra_settings | default([]) %} {{ item.setting }} = {{ item.value }} {% endfor %} @@ -236,7 +239,7 @@ data: bind 127.0.0.1 receptor_conf: | --- - - log-level: info + - log-level: {{ receptor_log_level }} - local-only: null - node: firewallrules: