From aa56bbc3f170f6d4b417354a111ad2c50d79d53a Mon Sep 17 00:00:00 2001
From: Jerome Doucerain <jerome.doucerain@bell.ca>
Date: Sat, 17 Mar 2018 14:36:12 -0400
Subject: SDNC parameterized persisted type and location

conditional subpath in case we are not using the NFS provisioner
parameterized location if we are using hostpath

Issue-ID: OOM-748

Change-Id: I982a75a91fa5e6349697867d188c3c83093e5e78
Signed-off-by: Jerome Doucerain <jerome.doucerain@bell.ca>
---
 kubernetes/sdnc/templates/db-statefulset.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'kubernetes/sdnc')

diff --git a/kubernetes/sdnc/templates/db-statefulset.yaml b/kubernetes/sdnc/templates/db-statefulset.yaml
index d0f141f868..29d592a6a7 100644
--- a/kubernetes/sdnc/templates/db-statefulset.yaml
+++ b/kubernetes/sdnc/templates/db-statefulset.yaml
@@ -82,7 +82,9 @@ spec:
         volumeMounts:
         - name: sdnc-data
           mountPath: /var/lib/mysql
+#{{ if not .Values.disableNfsProvisioner }}
           subPath: mysql
+#{{ end }}
         - name: conf
           mountPath: /etc/mysql/conf.d
       containers:
@@ -99,7 +101,9 @@ spec:
         volumeMounts:
         - mountPath: /var/lib/mysql
           name: sdnc-data
+#{{ if not .Values.disableNfsProvisioner }}
           subPath: mysql
+#{{ end }}
         - name: conf
           mountPath: /etc/mysql/conf.d
         ports:
@@ -178,7 +182,9 @@ spec:
         volumeMounts:
         - name: sdnc-data
           mountPath: /var/lib/mysql
+#{{ if not .Values.disableNfsProvisioner }}
           subPath: mysql
+#{{ end }}
         - name: conf
           mountPath: /etc/mysql/conf.d
         resources:
@@ -197,7 +203,7 @@ spec:
 #{{ if .Values.disableNfsProvisioner }}
       - name: sdnc-data
         hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/data
+          path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdnc/data/mysql
 #{{ else }}
   volumeClaimTemplates:
   - metadata:
@@ -211,3 +217,4 @@ spec:
           storage: 1Gi
 #{{ end }}
 #{{ end }}
+
-- 
cgit 1.2.3-korg