A complete working ADEI templte, v1-alpha

1 files changed, 12 insertions, 7 deletions

diff --git a/setup/projects/adei/vars/pods.yml b/setup/projects/adei/vars/pods.yml
index c0b943c..5278c44 100644
--- a/setup/projects/adei/vars/pods.yml
+++ b/setup/projects/adei/vars/pods.yml
@@ -5,16 +5,23 @@ pods:
     selector: { master: 1 }
     groups: [ "adei_db" ]
     images:
-      - image: "openshift/mysql-56-centos7"
+      - image: "centos/mysql-57-centos7"
         env:
             - { name: "MYSQL_USER", value: "adei" }
-            - { name: "MYSQL_PASSWORD", value: "adei" } 
+            - { name: "MYSQL_PASSWORD", value: "secret@adei/adei-password" } 
+            - { name: "MYSQL_ROOT_PASSWORD", value: "secret@adei/adei-password" } 
             - { name: "MYSQL_DATABASE", value: "adei" }
+            - { name: "PMA_PASSWORD", value: "secret@adei/pma-password" } 
         mappings: 
-            - { name: "adei_etc", path: "mysql", mount: "/etc/mysql" }
+            - { name: "adei_init", mount: "/var/lib/init" }
             - { name: "adei_db", path: "mysql", mount: "/var/lib/mysql/data" }
         probes:
             - { port: 3306 }
+#            - { type: "liveness", port: 3306 }
+#            - { type: "readiness", command: [/bin/sh, -i, -c, MYSQL_PWD="$MYSQL_PASSWORD" mysql -h 127.0.0.1 -u $MYSQL_USER -D $MYSQL_DATABASE, -e 'SELECT 1'] }
+        hooks:
+            - { type: "postStart", command: [ "/bin/bash", "/var/lib/init/mysql/initdb.sh" ] }
+
   phpmyadmin:
     service: { host: "phpmyadmin.{{ openshift_master_default_subdomain }}", ports: [ 80/8080 ] }
     sched: { replicas: 1 }
@@ -23,14 +30,12 @@ pods:
         env:
             - { name: "DB_SERVICE_HOST", value: "mysql.adei.svc.cluster.local" }
             - { name: "DB_SERVICE_PORT", value: "3306" } 
-            - { name: "DB_SERVICE_CONTROL_USER", value: "pma" }
-            - { name: "DB_SERVICE_CONTROL_PASSWORD", value: "adei" }
+#            - { name: "DB_SERVICE_CONTROL_USER", value: "pma" }
+#            - { name: "DB_SERVICE_CONTROL_PASSWORD", value: "secret@adei/pma-password" }
             - { name: "DB_EXTRA_HOSTS", value: "mysql.katrin.svc.cluster.local" }
         probes:
             - { port: 8080, path: '/' }
 
-
-
 #oc:
 #  - template: "[0-3]*"
 #  - template: "[4-6]*"