portal persistence folder parametrization

Issue-ID: OOM-145

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

diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index c6a38bd..068e0f7 100755 (executable)
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -142,10 +142,10 @@ spec:
             name: portal-mariadb-configmap
         - name: portal-root
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal
+            path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/portal
         - name: portal-logs
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/logs
+            path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/portal/logs
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
 #{{ end }}

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

diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index 2596d5e..abac400 100644 (file)
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -5,6 +5,7 @@ portalAppsReplicas: 1
 portalDbReplicas: 1
 vncPortalReplicas: 1
 portalWidgetsReplicas: 1
+dataRootDir: /dockerdata-nfs
 image:
   readiness: oomk8s/readiness-check:1.1.0
   portalapps: nexus3.onap.org:10001/onap/portal-apps:v1.3.0