Merge "sdc persistence folder parametrization"
diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
index 6485aa1..3b72071 100644
--- a/kubernetes/sdc/templates/sdc-be.yaml
+++ b/kubernetes/sdc/templates/sdc-be.yaml
@@ -107,7 +107,7 @@
name : sdc-log-be-configmap
- name: sdc-sdc-es-es
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
- name: sdc-environments
configMap:
name: sdc-environments-configmap
@@ -117,7 +117,7 @@
path: /etc/localtime
- name: sdc-logs
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
#{{ end }}
diff --git a/kubernetes/sdc/templates/sdc-cs.yaml b/kubernetes/sdc/templates/sdc-cs.yaml
index d70ead4..32aba46 100644
--- a/kubernetes/sdc/templates/sdc-cs.yaml
+++ b/kubernetes/sdc/templates/sdc-cs.yaml
@@ -75,7 +75,7 @@
path: /etc/localtime
- name: sdc-logs
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
#{{ end }}
diff --git a/kubernetes/sdc/templates/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml
index 3f2ef33..1a2f70d 100644
--- a/kubernetes/sdc/templates/sdc-es.yaml
+++ b/kubernetes/sdc/templates/sdc-es.yaml
@@ -71,7 +71,7 @@
path: /etc/localtime
- name: sdc-logs
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
#{{ end }}
diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml
index b4205ed..d1144d9 100644
--- a/kubernetes/sdc/templates/sdc-fe.yaml
+++ b/kubernetes/sdc/templates/sdc-fe.yaml
@@ -101,7 +101,7 @@
name : sdc-log-fe-configmap
- name: sdc-sdc-es-es
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
- name: sdc-environments
configMap:
name: sdc-environments-configmap
@@ -111,7 +111,7 @@
path: /etc/localtime
- name: sdc-logs
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs
- name: sdc-fe-config
configMap:
name: sdc-fe-configmap
diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml
index 658f6c1..a0a00a0 100644
--- a/kubernetes/sdc/templates/sdc-kb.yaml
+++ b/kubernetes/sdc/templates/sdc-kb.yaml
@@ -67,7 +67,7 @@
path: /etc/localtime
- name: sdc-logs
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
#{{ end }}
diff --git a/kubernetes/sdc/templates/sdc-pv-pvc.yaml b/kubernetes/sdc/templates/sdc-pv-pvc.yaml
index c8ce953..254e551 100644
--- a/kubernetes/sdc/templates/sdc-pv-pvc.yaml
+++ b/kubernetes/sdc/templates/sdc-pv-pvc.yaml
@@ -13,7 +13,7 @@
- ReadWriteMany
persistentVolumeReclaimPolicy: Retain
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-cs/CS
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/sdc-cs/CS
---
kind: PersistentVolumeClaim
apiVersion: v1
@@ -29,4 +29,4 @@
selector:
matchLabels:
name: "{{ .Values.nsPrefix }}-sdc-cs-db"
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml
index 0ed7626..d42abcc 100644
--- a/kubernetes/sdc/values.yaml
+++ b/kubernetes/sdc/values.yaml
@@ -1,6 +1,7 @@
nsPrefix: onap
pullPolicy: Always
nodePortPrefix: 302
+dataRootDir: /dockerdata-nfs
image:
readiness: oomk8s/readiness-check:1.1.0
sdcKibana: nexus3.onap.org:10001/openecomp/sdc-kibana:v1.1.0