Munin support for ADEI

1 files changed, 22 insertions, 3 deletions

diff --git a/setup/projects/adei/templates/60-adei.yml.j2 b/setup/projects/adei/templates/60-adei.yml.j2
index 87f734d..6d0ccae 100644
--- a/setup/projects/adei/templates/60-adei.yml.j2
+++ b/setup/projects/adei/templates/60-adei.yml.j2
@@ -135,15 +135,18 @@ objects:
 {%       if (cfg.groups is defined) or (cfg.run_as is defined) %}
                 securityContext:
 {%         if (cfg.run_as is defined) %}
-                  runAsUser: {{ (kaas_project_uids[cfg.run_as] is defined) | ternary(kaas_project_uids[cfg.run_as].id, cfg.run_as) }}
+{%             set user_info = kaas_project_uids[cfg.run_as] | default({}) %}
+                  runAsUser: {{ ('id' in user_info) | ternary(user_info.id, cfg.run_as) }}
 {%         endif %}
 {%       if (cfg.groups is defined) %}
 {%         if (ands_openshift_gid_mode | default('')) == "RunAsAny" %}
-                  fsGroup: {{ (kaas_project_gids[cfg.groups[0]] is defined) | ternary(kaas_project_gids[cfg.groups[0]].id, cfg.groups[0]) }}
+{%             set group_info = kaas_project_gids[cfg.groups[0]] | default({}) %}
+                  fsGroup: {{ ('id' in group_info) | ternary(group_info.id, cfg.groups[0]) }}
 {%         endif %}
                   supplementalGroups:
 {%           for group in cfg.groups %}
-                    - {{ (kaas_project_gids[group] is defined) | ternary(kaas_project_gids[group].id, group) }}
+{%             set group_info = kaas_project_gids[group] | default({}) %}
+                    - {{ ('id' in group_info) | ternary(group_info.id, group) }}
 {%           endfor %}
 {%         endif %}
 {%       endif %}
@@ -214,8 +217,21 @@ parameters:
   - name: setup
     value: "autogen"
     description: "ADEI setup"
+  - name: data_group
+    value: "{{ kaas_project_gids['adei_data'].id }}"
+    description: "gid (numerical only) to access the ADEI external data"
+  - name: data_volume
+    value: "adei-data"
+    description: "pvc providing access to the ADEI external data"
+  - name: data_path
+    value: "data"
+    description: "Path to ADEI external data on the specified pvc"
+  - name: forbid_data_writes
+    value: "true"
+    description: "Set to false to allow writes on the ADEI data volume"
   - name: haproxy_timeout
     value: "30s"
+    description: "Maximum service duration. HTTP error is returned if ADEI does not provide data within this time"
   - name: continuous_caching
     value: "1"
     description: "Stop cachers if no work or poll the source continously"  
@@ -236,6 +252,9 @@ parameters:
   - name: cache_replicas
     value: "2"
     description: "Default number of backend caching replicas"
+  - name: archive_replicas
+    value: "1"
+    description: "Number of backend replicas caching archived data"
   - name: cache_parallel
     value: "sources"
     description: "Type of caching parallelism by a cacher replica: (sources or groups)"