log persistence folder parametrization

Issue-ID: OOM-145

Change-Id: I27c98398b6304e17540f6c74afe4e1d811450683
Signed-off-by: kerenj <keren.joseph@amdocs.com>

diff --git a/kubernetes/log/templates/elasticsearch-deployment.yaml b/kubernetes/log/templates/elasticsearch-deployment.yaml
index bbf7260..85e5746 100644 (file)
--- a/kubernetes/log/templates/elasticsearch-deployment.yaml
+++ b/kubernetes/log/templates/elasticsearch-deployment.yaml
@@ -67,7 +67,7 @@ spec:
             claimName: elasticsearch-db
         - name: elasticsearch-logs
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/
+            path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/log/
         - name: elasticsearch-conf
           configMap:
             name: elasticsearch-configmap

diff --git a/kubernetes/log/templates/log-pv-pvc.yaml b/kubernetes/log/templates/log-pv-pvc.yaml
index 4f24471..a5e5ff7 100644 (file)
--- a/kubernetes/log/templates/log-pv-pvc.yaml
+++ b/kubernetes/log/templates/log-pv-pvc.yaml
@@ -13,7 +13,7 @@ spec:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
   hostPath:
-    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/elasticsearch/data
+    path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/log/elasticsearch/data
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
@@ -29,4 +29,4 @@ spec:
   selector:
     matchLabels:
       name: elasticsearch-db
-#{{ end }}
\ No newline at end of file
+#{{ end }}

diff --git a/kubernetes/log/values.yaml b/kubernetes/log/values.yaml
index c70055b..af53915 100644 (file)
--- a/kubernetes/log/values.yaml
+++ b/kubernetes/log/values.yaml
@@ -1,6 +1,7 @@
 nsPrefix: onap
 pullPolicy: Always
 nodePortPrefix: 302
+dataRootDir: /dockerdata-nfs
 image:
   readiness: oomk8s/readiness-check:1.1.0
   logstash: docker.elastic.co/logstash/logstash:5.4.3