3 files changed, 10 insertions, 10 deletions
diff --git a/kubernetes/mso/templates/all-services.yaml b/kubernetes/mso/templates/all-services.yaml
index 6e2db71650..a0807d759e 100644
--- a/kubernetes/mso/templates/all-services.yaml
+++ b/kubernetes/mso/templates/all-services.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: mariadb
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-mso"
   labels:
     app: mariadb
 spec:
@@ -17,7 +17,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: mso
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-mso"
   labels:
     app: mso
 spec:
diff --git a/kubernetes/mso/templates/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml
index ff1cf75350..76cf2ec912 100644
--- a/kubernetes/mso/templates/db-deployment.yaml
+++ b/kubernetes/mso/templates/db-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: mariadb
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-mso"
 spec:
   replicas: 1
   selector:
@@ -43,9 +43,9 @@ spec:
       volumes:
         - name: mso-mariadb-conf
           hostPath:
-            path: /dockerdata-nfs/onap/mso/mariadb/conf.d
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/conf.d
         - name: mso-mariadb-docker-entrypoint-initdb
           hostPath:
-            path: /dockerdata-nfs/onap/mso/mariadb/docker-entrypoint-initdb.d
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/docker-entrypoint-initdb.d
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml
index 6f12769d5a..0f3034f4cc 100644
--- 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:
@@ -68,9 +68,9 @@ spec:
       volumes:
         - 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
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"