summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--setup/projects/adei/templates/01-webdav-secret.yml.j24
-rw-r--r--setup/projects/adei/templates/60-adei.yml.j27
-rw-r--r--setup/projects/adei/vars/globals.yml31
3 files changed, 26 insertions, 16 deletions
diff --git a/setup/projects/adei/templates/01-webdav-secret.yml.j2 b/setup/projects/adei/templates/01-webdav-secret.yml.j2
index f09b1ec..9dc978d 100644
--- a/setup/projects/adei/templates/01-webdav-secret.yml.j2
+++ b/setup/projects/adei/templates/01-webdav-secret.yml.j2
@@ -14,4 +14,6 @@ objects:
template.openshift.io/expose-repo: '{.data[''repo'']}'
name: webdav
stringData:
- repo: "https+webdav://adei:{{ kaas_project_config.adei_password }}@darksoft.org/openshift"
+ repo: "https+webdav://darksoft.org/openshift"
+ user: "adei"
+ password: "{{ kaas_project_config.adei_password }}"
diff --git a/setup/projects/adei/templates/60-adei.yml.j2 b/setup/projects/adei/templates/60-adei.yml.j2
index 45bdfae..c7c53f9 100644
--- a/setup/projects/adei/templates/60-adei.yml.j2
+++ b/setup/projects/adei/templates/60-adei.yml.j2
@@ -189,13 +189,12 @@ objects:
timeoutSeconds: 1
periodSeconds: 300
initialDelaySeconds: 300
- httpGet:
- path: /adei/probe.php
+ tcpSocket:
port: 8080
readinessProbe:
timeoutSeconds: 1
- periodSeconds: 10
- initialDelaySeconds: 10
+ periodSeconds: 30
+ initialDelaySeconds: 5
httpGet:
path: /adei/probe.php
port: 8080
diff --git a/setup/projects/adei/vars/globals.yml b/setup/projects/adei/vars/globals.yml
index 1784b61..c890796 100644
--- a/setup/projects/adei/vars/globals.yml
+++ b/setup/projects/adei/vars/globals.yml
@@ -3,8 +3,12 @@ adei_domain: "{{ openshift_master_default_subdomain }}"
adei_pod_history_limit: 2
adei_pod_env:
+ - name: "ENV"
+ value: "~/.bashrc"
- name: "HOME"
- value: "/tmp"
+ value: "/data/home"
+ - name: "SHELL"
+ value: "/bin/bash"
- name: "MYSQL_PORT"
value: "3306"
- name: "MYSQL_USER"
@@ -28,11 +32,24 @@ adei_pod_env:
value: "INNODB"
- name: "ADEI_TRANSACTION_SIZE"
value: "1000"
+ - name: "BZR_EMAIL"
+ value: "${maintainer}"
- name: "ADEI_REPOSITORY"
valueFrom:
secretKeyRef:
name: webdav
key: repo
+ - name: "ADEI_REPOSITORY_USER"
+ valueFrom:
+ secretKeyRef:
+ name: webdav
+ key: user
+# - name: "ADEI_REPOSITORY_PASSWORD"
+# valueFrom:
+# secretKeyRef:
+# name: webdav
+# key: password
+
adei_prod_env:
- name: "MYSQL_SERVER"
@@ -62,7 +79,7 @@ adei_log_env:
- name: "ADEI_DEBUG"
value: "0"
- name: "APACHE_SERVERS"
- value: "5"
+ value: "64"
adei_debug_env:
- name: "MYSQL_SERVER"
@@ -76,7 +93,7 @@ adei_debug_env:
- name: "ADEI_DEBUG"
value: "0"
- name: "APACHE_SERVERS"
- value: "5"
+ value: "64"
adei_cron_env:
- name: "MYSQL_SERVER"
@@ -103,14 +120,6 @@ adei_admin_env:
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"