ADEI cachers

1 files changed, 24 insertions, 17 deletions

diff --git a/setup/projects/adei/templates/60-adei.yml.j2 b/setup/projects/adei/templates/60-adei.yml.j2
index 88bfa89..41840e4 100644
--- a/setup/projects/adei/templates/60-adei.yml.j2
+++ b/setup/projects/adei/templates/60-adei.yml.j2
@@ -9,7 +9,7 @@ metadata:
     openshift.io/documentation-url: "http://adei.info"
     openshift.io/support-url: "http://adei.info"
 labels:
-  name: adei
+  app: "adei"
 objects:
 {% for name, cfg in adei_frontends.iteritems() %}
 {%   if (cfg.enabled | default(true))  %}
@@ -62,6 +62,8 @@ objects:
     spec:
       schedule: "{{ cfg.cron }}"
       concurrencyPolicy: "Forbid"
+      successfulJobsHistoryLimit: "2"
+      failedJobsHistoryLimit: "2"
       jobTemplate:
         spec:
             completions: "1"
@@ -98,7 +100,6 @@ objects:
 {%     endif  %}
                 name: "{{ cfg.name }}"
                 labels:
-                  app: "adei"
                   name: "{{ cfg.name }}"
                   adei-type: "{{ pod_type }}"
                   adei-name: "{{ name }}"
@@ -171,31 +172,37 @@ parameters:
   - name: setup
     value: "autogen"
     description: "ADEI setup"
+  - name: continuous_caching
+    value: "1"
+    description: "Stop cachers if no work or poll the source continously"  
+  - name: enable_logs
+    value: "1"
+    description: "Enable detailed ADEI logging (large volume)"
+  - name: enable_debug
+    value: "0"
+    description: "Include debugging information in ADEI logs (huge volume)"
   - name: adei_replicas
     value: "2"
     description: "Number of frontend replics"
-  - name: cache_replicas
-    value: "1"
-    description: "Default number of backend caching replicas"
   - name: apache_servers
     value: "150"
-  - name: adei_schedule_cache
+  - name: sched_parallel
+    value: "sources"
+    description: "Basic unit of scheduling (servers or sources)"
+  - name: cache_replicas
+    value: "2"
+    description: "Default number of backend caching replicas"
+  - name: cache_parallel
+    value: "sources"
+    description: "Type of caching parallelism by a cacher replica: (sources or groups)"
+  - name: update_schedule
     value: "*/5 * * * *"
     description: "Schedule of caching group updates"
-  - name: adei_schedule_maintain
+  - name: maintain_schedule
     value: "*/15 * * * *"
     description: "Schedule of maintain tasks"
-  - name: adei_schedule_clean
+  - name: clean_schedule
     value: "9 3 * * *"
     description: "Schedule of cleaning tasks"
-  - name: cache_parallel
-    value: "source"
-    description: "Type of caching parallelism: group, source, server"
-  - name: enable_logs
-    value: "1"
-    description: "Enable detailed ADEI logging (large volume)"
-  - name: enable_debug
-    value: "0"
-    description: "Include debugging information in ADEI logs (huge volume)"
   - name: "adei_revision"
     value: "last:1"