Add directoy option for receptors data

ansible · Dec 5, 2023 · 5236c3e · 5236c3e
1 parent a61ed18
commit 5236c3e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/config/crd/bases/awx.ansible.com_awxs.yaml b/config/crd/bases/awx.ansible.com_awxs.yaml
@@ -1792,6 +1792,9 @@ spec:
               receptor_log_level:
                 description: Set log level of receptor service
                 type: string
+              receptor_datadir:
+                description: Set directory for receptor logs
+                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
@@ -889,6 +889,11 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:advanced
         - urn:alm:descriptor:com.tectonic.ui:hidden
+      - displayName: Receptor Persistant Data Directory
+        path: receptor_datadir
+        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
@@ -458,6 +458,8 @@ host_aliases: ''
 
 receptor_log_level: info
 
+receptor_datadir: /var/run/receptor/
+
 # UWSGI default values
 uwsgi_processes: 5
 # NOTE: to increase this value, net.core.somaxconn must also be increased

diff --git a/roles/installer/templates/configmaps/config.yaml.j2 b/roles/installer/templates/configmaps/config.yaml.j2
@@ -86,6 +86,8 @@ data:
 
     RECEPTOR_LOG_LEVEL = '{{ receptor_log_level }}'
 
+    RECEPTOR_DATADIR = '{{ receptor_datadir }}'
+
 
 {% for item in extra_settings | default([]) %}
     {{ item.setting }} = {{ item.value }}
@@ -243,10 +245,11 @@ data:
     - log-level: {{ receptor_log_level }}
     - local-only: null
     - node:
-       firewallrules:
-        - action: reject
-          tonode: HOSTNAME
-          toservice: control
+        datadir: {{ receptor_datadir }}
+        firewallrules:
+          - action: reject
+            tonode: HOSTNAME
+            toservice: control
     - control-service:
         service: control
         filename: /var/run/receptor/receptor.sock