summaryrefslogtreecommitdiffstats
path: root/kubernetes/mso/templates
diff options
context:
space:
mode:
authorMandeep Khinda <mandeep.khinda@amdocs.com>2017-09-21 20:00:13 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2017-09-21 20:00:13 +0000
commitc6dba8f5d2f7aef6b2a876b05b8c12301dd71f93 (patch)
treed0a8ccc4c7e6fb32bcfd31c60e1bb031b47ed386 /kubernetes/mso/templates
parent46f145552e1554dc909c49d19d344da8ae7f6503 (diff)
synching up SO 1.1
trying to keep up with changes in SO upstream 1.1 -robot health check still fails with a HTTP 503. --The same error is observed in the HEAT env. -unforking config directories and instead mounting files that we need to change. -the DB boot sql scripts are checked out on the VM and are not within the container which makes keeping in synch an ongoing process until we spend time improving config/boot Issue-ID: OOM-311 Change-Id: Ia91ced683ca985184c2752917795e2b7ebffb9a8 Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/mso/templates')
-rw-r--r--kubernetes/mso/templates/db-deployment.yaml5
-rw-r--r--kubernetes/mso/templates/mso-deployment.yaml6
2 files changed, 3 insertions, 8 deletions
diff --git a/kubernetes/mso/templates/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml
index 4722c4a0c5..d105744f7e 100644
--- a/kubernetes/mso/templates/db-deployment.yaml
+++ b/kubernetes/mso/templates/db-deployment.yaml
@@ -4,7 +4,6 @@ metadata:
name: mariadb
namespace: "{{ .Values.nsPrefix }}-mso"
spec:
- replicas: 1
selector:
matchLabels:
app: mariadb
@@ -23,10 +22,6 @@ spec:
env:
- name: MYSQL_ROOT_PASSWORD
value: password
- - name: MARIADB_MAJOR
- value: "10.1"
- - name: MARIADB_VERSION
- value: "10.1.11+maria-1~jessie"
volumeMounts:
- mountPath: /etc/localtime
name: localtime
diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml
index 8973db3e6f..862f572d3c 100644
--- a/kubernetes/mso/templates/mso-deployment.yaml
+++ b/kubernetes/mso/templates/mso-deployment.yaml
@@ -42,7 +42,7 @@ spec:
spec:
containers:
- command:
- - /docker-files/scripts/start-jboss-server.sh
+ - /tmp/start-jboss-server.sh
image: {{ .Values.image.mso }}
imagePullPolicy: {{ .Values.pullPolicy }}
name: mso
@@ -52,7 +52,7 @@ spec:
readOnly: true
- mountPath: /shared
name: mso
- - mountPath: /docker-files
+ - mountPath: /tmp/start-jboss-server.sh
name: mso-docker-files
env:
- name: JBOSS_DEBUG
@@ -77,6 +77,6 @@ spec:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mso
- name: mso-docker-files
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"