synching up SO 1.1

[oom.git] / kubernetes / mso / templates / mso-deployment.yaml

diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml
index 6f12769..862f572 100644 (file)
--- a/kubernetes/mso/templates/mso-deployment.yaml
+++ b/kubernetes/mso/templates/mso-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: mso
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-mso"
 spec:
   replicas: 1
   selector:
@@ -42,14 +42,17 @@ 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
         volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /shared
           name: mso
-        - mountPath: /docker-files
+        - mountPath: /tmp/start-jboss-server.sh
           name: mso-docker-files
         env:
         - name: JBOSS_DEBUG
@@ -66,11 +69,14 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
       volumes:
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
         - name: mso
           hostPath:
-            path: /dockerdata-nfs/onap/mso/mso
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mso
         - name: mso-docker-files
           hostPath:
-            path: /dockerdata-nfs/onap/mso/docker-files
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"