diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-02-27 13:11:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-27 13:11:35 +0000 |
| commit | 0361f428042e6121e9e89d3adfcf3b017c54a9a4 (patch) | |
| tree | 2694a1c24fe191ea2c5951d87b746aef15d3dea4 | |
| parent | 6a637e070e5783d00cdbead0278cd00791ad26cd (diff) | |
| parent | 81c063dd27998e577fdbc0c65c55a61785532c50 (diff) | |
Merge "log persistence folder parametrization"
| -rw-r--r-- | kubernetes/log/templates/elasticsearch-deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/log/templates/log-pv-pvc.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/log/values.yaml | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/kubernetes/log/templates/elasticsearch-deployment.yaml b/kubernetes/log/templates/elasticsearch-deployment.yaml index bbf7260faa..85e57460bc 100644 --- a/kubernetes/log/templates/elasticsearch-deployment.yaml +++ b/kubernetes/log/templates/elasticsearch-deployment.yaml @@ -67,7 +67,7 @@ spec: claimName: elasticsearch-db - name: elasticsearch-logs hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/ + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/log/ - name: elasticsearch-conf configMap: name: elasticsearch-configmap diff --git a/kubernetes/log/templates/log-pv-pvc.yaml b/kubernetes/log/templates/log-pv-pvc.yaml index 4f244718d0..a5e5ff76e1 100644 --- a/kubernetes/log/templates/log-pv-pvc.yaml +++ b/kubernetes/log/templates/log-pv-pvc.yaml @@ -13,7 +13,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/elasticsearch/data + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/log/elasticsearch/data --- kind: PersistentVolumeClaim apiVersion: v1 @@ -29,4 +29,4 @@ spec: selector: matchLabels: name: elasticsearch-db -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/log/values.yaml b/kubernetes/log/values.yaml index c70055be97..af53915d27 100644 --- a/kubernetes/log/values.yaml +++ b/kubernetes/log/values.yaml @@ -1,6 +1,7 @@ nsPrefix: onap pullPolicy: Always nodePortPrefix: 302 +dataRootDir: /dockerdata-nfs image: readiness: oomk8s/readiness-check:1.1.0 logstash: docker.elastic.co/logstash/logstash:5.4.3 |