X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blobdiff_plain;f=kubernetes%2Flog%2Ftemplates%2Flog-pv-pvc.yaml;h=20bcbb15c19f85676177ee6322d8dd21fc0b316f;hp=7e51e4c525ccbc3bea66e8bc8904b4accef48eb4;hb=4e4b97524ca8731bbb2b3080ca85b139f0096ce5;hpb=5ec693b7718b132e9dbf5befc5b3b2ccce2a133c

diff --git a/kubernetes/log/templates/log-pv-pvc.yaml b/kubernetes/log/templates/log-pv-pvc.yaml
index 7e51e4c525..20bcbb15c1 100644
--- a/kubernetes/log/templates/log-pv-pvc.yaml
+++ b/kubernetes/log/templates/log-pv-pvc.yaml
@@ -1,10 +1,27 @@
+{{/*
+# 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.disableLogElasticsearch }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: elasticsearch-db
-  namespace: "{{ .Values.nsPrefix }}-log"
+  name: {{ .Values.nsPrefix }}-elasticsearch-db
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
-    name: elasticsearch-db
+    name: {{ .Values.nsPrefix }}-elasticsearch-db
 spec:
   capacity:
     storage: 2Gi
@@ -12,13 +29,13 @@ spec:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
   hostPath:
-    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/elasticsearch/data
+    path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/log/elasticsearch/data
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: elasticsearch-db
-  namespace: "{{ .Values.nsPrefix }}-log"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   accessModes:
     - ReadWriteMany
@@ -27,4 +44,5 @@ spec:
       storage: 2Gi
   selector:
     matchLabels:
-      name: elasticsearch-db
+      name: {{ .Values.nsPrefix }}-elasticsearch-db
+#{{ end }}