X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmso%2Ftemplates%2Fmso-pv-pvc.yaml;h=19dea045481538aebad52b585e8cc6c7e5bdaef8;hb=e04b2feb855e5ab20e28c867d2bd7f89f6b8c425;hp=47389e3ff0eaeb6d21ae099a095aa5e2a4fc4eaa;hpb=db4c9ae652b8222acf931f093e2e0ede44bc270f;p=oom.git

diff --git a/kubernetes/mso/templates/mso-pv-pvc.yaml b/kubernetes/mso/templates/mso-pv-pvc.yaml
index 47389e3ff0..19dea04548 100644
--- a/kubernetes/mso/templates/mso-pv-pvc.yaml
+++ b/kubernetes/mso/templates/mso-pv-pvc.yaml
@@ -1,10 +1,25 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#{{ if not .Values.disableMsoMariadb }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: "{{ .Values.nsPrefix }}-mso-db"
-  namespace: "{{ .Values.nsPrefix }}-mso"
+  name: "{{ .Values.nsPrefix }}-mso"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
-    name: "{{ .Values.nsPrefix }}-mso-db"
+    name: "{{ .Values.nsPrefix }}-mso"
 spec:
   capacity:
     storage: 2Gi
@@ -12,13 +27,13 @@ spec:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
   hostPath:
-    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/data
+    path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/mso/mariadb/data
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: mso-db
-  namespace: "{{ .Values.nsPrefix }}-mso"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   accessModes:
     - ReadWriteMany
@@ -27,4 +42,5 @@ spec:
       storage: 2Gi
   selector:
     matchLabels:
-      name: "{{ .Values.nsPrefix }}-mso-db"
+      name: "{{ .Values.nsPrefix }}-mso"
+#{{ end }}