OOM-1565: AAI Volume chart Persistent mount

AAI volumes chart is not taking global
Persistent Mount into consideration

Change-Id: I2d861e2406c95bfb0e923d068d29b68c4a61a68b
Issue-ID: OOM-1565
Signed-off-by: Rahul Sharma <Rahul.Sharma2@amdocs.com>

diff --git a/kubernetes/aai/charts/aai-cassandra/templates/volumes.yaml b/kubernetes/aai/charts/aai-cassandra/templates/volumes.yaml
index b949064..5b8f881 100644 (file)
--- a/kubernetes/aai/charts/aai-cassandra/templates/volumes.yaml
+++ b/kubernetes/aai/charts/aai-cassandra/templates/volumes.yaml
@@ -33,7 +33,7 @@ spec:
   accessModes:
     - {{ $root.Values.persistence.accessMode }}
   hostPath:
-    path: {{ $root.Values.persistence.mountPath }}/{{ $root.Release.Name }}/{{ $root.Values.persistence.mountSubPath }}-{{ $i }}
+    path: {{ $root.Values.global.persistence.mountPath | default $root.Values.persistence.mountPath }}/{{ $root.Release.Name }}/{{ $root.Values.persistence.mountSubPath }}-{{ $i }}
   persistentVolumeReclaimPolicy: {{ $root.Values.persistence.volumeReclaimPolicy }}
 {{ end }}
 #{{ end }}

diff --git a/kubernetes/aai/charts/aai-cassandra/values.yaml b/kubernetes/aai/charts/aai-cassandra/values.yaml
index 1e1d2c1..24f9c78 100644 (file)
--- a/kubernetes/aai/charts/aai-cassandra/values.yaml
+++ b/kubernetes/aai/charts/aai-cassandra/values.yaml
@@ -17,7 +17,7 @@
 # Declare variables to be passed into your templates.
 global: # global defaults
   nodePortPrefix: 302
-
+  persistence: {}
 
 # application image
 dockerhubRepository: registry.hub.docker.com