From efe4b9bbe3c9cb950378de9697eed2030ac49ca2 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Sun, 6 Oct 2019 04:55:40 +0200
Subject: Optimize ADEI template: mini-containers for cron-jobs, adjust
 scheduling intervals to reduce load spikes

---
 setup/projects/adei/vars/globals.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'setup/projects/adei/vars')

diff --git a/setup/projects/adei/vars/globals.yml b/setup/projects/adei/vars/globals.yml
index 8f67572..120f880 100644
--- a/setup/projects/adei/vars/globals.yml
+++ b/setup/projects/adei/vars/globals.yml
@@ -106,6 +106,8 @@ adei_cron_env:
       value: "${setup}"
     - name: "ADEI_SCHEDULER"
       value: "${sched_parallel}"
+    - name: "LC_ALL"
+      value: "C"
 
 adei_update_env:
     - name: "ADEI_CONTINUOUS_CACHING"
@@ -199,7 +201,7 @@ adei_pod_mounts:
       mountPath: /adei/tmp
     - name: adei-log
       subPath: "${setup}/apache2"
-      mountPath: /var/log/apache2
+      mountPath: /adei/log/
     - name: adei-data
       subPath: "${data_path}"
       mountPath: "/adei/data/${setup}"
@@ -278,6 +280,7 @@ adei_frontends:
       enabled: true
     update:
       name: "adei-${setup}-update"
+      image: "adei-mini:latest"
       cron: "${update_schedule}"
       cmd: [ "/openshift-entrypoint.sh", "/adei/src/scripts/cron/adei.cron.sh" ]
       env: "{{ adei_pod_env | union(adei_cron_env) | union(adei_update_env) }}"
@@ -287,6 +290,7 @@ adei_frontends:
       enabled: true
     maintain:
       name: "adei-${setup}-maintain"
+      image: "adei-mini:latest"
       cron: "${maintain_schedule}"
       cmd: [ "/openshift-entrypoint.sh", "/adei/src/scripts/cron/adei_manager.cron.sh" ]
       env: "{{ adei_pod_env | union(adei_cron_env) }}"
@@ -296,12 +300,14 @@ adei_frontends:
       enabled: true
     clean:
       name: "adei-${setup}-clean"
+      image: "adei-mini:latest"
       cron: "${clean_schedule}"
       cmd: [ "/openshift-entrypoint.sh", "/adei/src/scripts/cron/adei_clean.cron.sh" ]
       env: "{{ adei_pod_env | union(adei_cron_env) }}"
       vols: "{{ adei_pod_vols }}"
       mounts: "{{ adei_prod_mounts | union(adei_pod_mounts) }}"
       groups: [ "adei", "${{ '{{' }}data_group{{ '}}' }}" ]
+      max_run_time: 14400
       enabled: true
     admin:
       name: "adei-${setup}-admin"
-- 
cgit v1.2.3