Various fixes and provide ADEI admin container...

1 files changed, 57 insertions, 12 deletions

diff --git a/setup/projects/adei/vars/globals.yml b/setup/projects/adei/vars/globals.yml
index 8435926..fef5a5b 100644
--- a/setup/projects/adei/vars/globals.yml
+++ b/setup/projects/adei/vars/globals.yml
@@ -24,6 +24,13 @@ adei_pod_env:
       value: "${adei_revision}"
     - name: "ADEI_PATH"
       value: "/adei/src"
+    - name: "ADEI_CACHE_ENGINE"
+      value: "INNODB"
+    - name: "ADEI_REPOSITORY"
+      valueFrom: 
+        secretKeyRef:
+          name: webdav
+          key: repo
 
 adei_prod_env:
     - name: "MYSQL_SERVER"
@@ -81,6 +88,28 @@ adei_update_env:
     - name: "ADEI_CONTINUOUS_CACHING"
       value: "${continuous_caching}"
 
+adei_admin_env:
+    - name: "ADEI_ADMIN"
+      value: "1"
+    - name: "MYSQL_SERVER"
+      value: "mysql-master.adei.svc.cluster.local"
+    - name: "ADEI_SETUP"
+      value: "${setup}"
+    - name: "ADEI_URL"
+      value: "http://adei-${setup}-debug.adei.svc.cluster.local/adei"
+    - name: "ADEI_SCHEDULER"
+      value: "${sched_parallel}"
+    - name: "ADEI_PARALLEL"
+      value: "${cache_parallel}"
+    - name: "BZR_EMAIL"
+      value: "${maintainer}"
+    - name: "ENV"
+      value: "~/.bashrc"
+    - name: "HOME"
+      value: "/data/home"
+    - name: "SHELL"
+      value: "/bin/bash"
+
 adei_cache_env:
     - name: "MYSQL_SERVER"
       value: "mysql-master.adei.svc.cluster.local"
@@ -119,9 +148,6 @@ adei_log_cache_env:
 
 
 adei_pod_vols:
-    - name: adei-etc
-      persistentVolumeClaim: 
-        claimName: adei-etc
     - name: adei-src
       persistentVolumeClaim: 
         claimName: adei-src
@@ -138,15 +164,10 @@ adei_pod_vols:
       persistentVolumeClaim: 
         claimName: adei-log
 
-adei_prod_mounts:
-    - name: adei-src
-      subPath: prod
-      mountPath: /adei/src
-
-adei_dbg_mounts:
-    - name: adei-src
-      subPath: dbg
-      mountPath: /adei/src
+adei_admin_vols:
+    - name: adei-data
+      persistentVolumeClaim:
+        claimName: adei-data
 
 adei_pod_mounts:
     - name: adei-cfg
@@ -162,6 +183,20 @@ adei_pod_mounts:
       subPath: "${setup}/apache2"
       mountPath: /var/log/apache2
 
+adei_prod_mounts:
+    - name: adei-src
+      subPath: prod
+      mountPath: /adei/src
+
+adei_dbg_mounts:
+    - name: adei-src
+      subPath: dbg
+      mountPath: /adei/src
+
+adei_admin_mounts:
+    - name: adei-data
+      mountPath: /data
+
 adei_frontends:
     frontend:
       name: "adei-${setup}"
@@ -246,6 +281,16 @@ adei_frontends:
       mounts: "{{ adei_prod_mounts | union(adei_pod_mounts) }}"
       groups: [ "adei" ]
       enabled: true
+    admin:
+      name: "adei-${setup}-admin"
+      type: admin
+      replicas: 0
+      cmd: [ "/docker-entrypoint.sh", "/adei/src/scripts/system/adminer.sh" ]
+      env: "{{ adei_pod_env | union(adei_admin_env) }}"
+      vols: "{{ adei_pod_vols | union(adei_admin_vols) }}"
+      mounts: "{{ adei_dbg_mounts | union(adei_pod_mounts) | union(adei_admin_mounts)  }}"
+      groups: [ "adei" ]
+      enabled: true
 
 # Extra options:
 #      start_tolerance: 30