3 files changed, 61 insertions, 6 deletions
diff --git a/kubernetes/mso/templates/all-services.yaml b/kubernetes/mso/templates/all-services.yaml
index a0807d759e..96c7fd79e8 100644
--- a/kubernetes/mso/templates/all-services.yaml
+++ b/kubernetes/mso/templates/all-services.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   ports:
     - port: 3306
-      nodePort: 30252
+      nodePort: {{ .Values.nodePortPrefix }}52
   selector:
     app: mariadb
   type: NodePort
@@ -20,23 +20,43 @@ metadata:
   namespace: "{{ .Values.nsPrefix }}-mso"
   labels:
     app: mso
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "so",
+          "version": "v1",
+          "url": "/ecomp/mso/infra",
+          "protocol": "REST"
+          "port": "8080",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "so-deprecated",
+          "version": "v1",
+          "url": "/ecomp/mso/infra",
+          "protocol": "REST"
+          "port": "8080",
+          "visualRange":"1",
+          "path":"/ecomp/mso/infra"
+      }
+      ]'
 spec:
   selector:
     app: mso
   ports:
     - name: mso1
       port: 8080
-      nodePort: 30223
+      nodePort: {{ .Values.nodePortPrefix }}23
     - name: mso2
       port: 3904
-      nodePort: 30225
+      nodePort: {{ .Values.nodePortPrefix }}25
     - name: mso3
       port: 3905
-      nodePort: 30224
+      nodePort: {{ .Values.nodePortPrefix }}24
     - name: mso4
       port: 9990
-      nodePort: 30222
+      nodePort: {{ .Values.nodePortPrefix }}22
     - name: mso5
       port: 8787
-      nodePort: 30250
+      nodePort: {{ .Values.nodePortPrefix }}50
   type: NodePort
diff --git a/kubernetes/mso/templates/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml
index 76cf2ec912..389fb5ab75 100644
--- a/kubernetes/mso/templates/db-deployment.yaml
+++ b/kubernetes/mso/templates/db-deployment.yaml
@@ -32,6 +32,8 @@ spec:
           name: mso-mariadb-conf
         - mountPath: /docker-entrypoint-initdb.d
           name: mso-mariadb-docker-entrypoint-initdb
+        - mountPath: /var/lib/mysql
+          name: mso-mariadb-data
         ports:
         - containerPort: 3306
           name: mariadb
@@ -47,5 +49,8 @@ spec:
         - name: mso-mariadb-docker-entrypoint-initdb
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/docker-entrypoint-initdb.d
+        - name: mso-mariadb-data
+          persistentVolumeClaim:
+            claimName: mso-db
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/mso/templates/mso-pv-pvc.yaml b/kubernetes/mso/templates/mso-pv-pvc.yaml
new file mode 100644
index 0000000000..c195980841
--- /dev/null
+++ b/kubernetes/mso/templates/mso-pv-pvc.yaml
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: mso-db
+  namespace: "{{ .Values.nsPrefix }}-mso"
+  labels:
+    name: mso-db
+spec:
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  hostPath:
+    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/data
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: mso-db
+  namespace: "{{ .Values.nsPrefix }}-mso"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 2Gi
+  selector:
+    matchLabels:
+      name: mso-db