From e2e63509fb22f5e5739b04c8e4b2b91b430a669c Mon Sep 17 00:00:00 2001
From: kerenj <keren.joseph@amdocs.com>
Date: Sun, 25 Feb 2018 12:22:53 +0000
Subject: [PATCH] message-router persistence folder parametrization

Issue-ID: OOM-145

Change-Id: Ie4f0bf36d6249bafd6f04f4ba421b15f01d4d627
Signed-off-by: kerenj <keren.joseph@amdocs.com>
---
 kubernetes/message-router/templates/message-router-dmaap.yaml  | 6 +++---
 kubernetes/message-router/templates/message-router-pv-pvc.yaml | 6 +++---
 kubernetes/message-router/values.yaml                          | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml
index cecf69b86f..1224e993ed 100644
--- a/kubernetes/message-router/templates/message-router-dmaap.yaml
+++ b/kubernetes/message-router/templates/message-router-dmaap.yaml
@@ -61,13 +61,13 @@ spec:
           path: /etc/localtime
       - name: appprops
         hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties
+          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties
       - name: cadi
         hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties
+          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties
       - name: mykey
         hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/mykey
+          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/mykey
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 {{ end }}
diff --git a/kubernetes/message-router/templates/message-router-pv-pvc.yaml b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
index 53329ca29b..3b85a70b7e 100644
--- a/kubernetes/message-router/templates/message-router-pv-pvc.yaml
+++ b/kubernetes/message-router/templates/message-router-pv-pvc.yaml
@@ -13,7 +13,7 @@ spec:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
   hostPath:
-    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
+    path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
@@ -46,7 +46,7 @@ spec:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
   hostPath:
-    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
+    path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
@@ -62,4 +62,4 @@ spec:
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-message-router-zookeeper"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/message-router/values.yaml b/kubernetes/message-router/values.yaml
index 9a592f4ead..bbc95ab718 100644
--- a/kubernetes/message-router/values.yaml
+++ b/kubernetes/message-router/values.yaml
@@ -4,6 +4,7 @@ nodePortPrefix: 302
 dmaapReplicas: 1
 kafkaReplicas: 1
 zookeeperReplicas: 1
+dataRootDir: /dockerdata-nfs
 image:
   readiness: oomk8s/readiness-check:1.1.0
   dmaap: attos/dmaap:latest
-- 
2.16.6