diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-02-27 13:11:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-27 13:11:37 +0000 |
| commit | d0bea7a049392c036b068a8671d1d04a25c6649b (patch) | |
| tree | 006c87b8bb9f40eda349cb1e33e1166a9847c474 /kubernetes | |
| parent | 0361f428042e6121e9e89d3adfcf3b017c54a9a4 (diff) | |
| parent | e2e63509fb22f5e5739b04c8e4b2b91b430a669c (diff) | |
Merge "message-router persistence folder parametrization"
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/message-router/templates/message-router-dmaap.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/message-router/templates/message-router-pv-pvc.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/message-router/values.yaml | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml index cecf69b86f..1224e993ed 100644 --- a/kubernetes/message-router/templates/message-router-dmaap.yaml +++ b/kubernetes/message-router/templates/message-router-dmaap.yaml @@ -61,13 +61,13 @@ spec: path: /etc/localtime - name: appprops hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties - name: cadi hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties - name: mykey hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dmaap/mykey + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/mykey imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" {{ end }} diff --git a/kubernetes/message-router/templates/message-router-pv-pvc.yaml b/kubernetes/message-router/templates/message-router-pv-pvc.yaml index 53329ca29b..3b85a70b7e 100644 --- a/kubernetes/message-router/templates/message-router-pv-pvc.yaml +++ b/kubernetes/message-router/templates/message-router-pv-pvc.yaml @@ -13,7 +13,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/ + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/ --- kind: PersistentVolumeClaim apiVersion: v1 @@ -46,7 +46,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper --- kind: PersistentVolumeClaim apiVersion: v1 @@ -62,4 +62,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-message-router-zookeeper" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/message-router/values.yaml b/kubernetes/message-router/values.yaml index 9a592f4ead..bbc95ab718 100644 --- a/kubernetes/message-router/values.yaml +++ b/kubernetes/message-router/values.yaml @@ -4,6 +4,7 @@ nodePortPrefix: 302 dmaapReplicas: 1 kafkaReplicas: 1 zookeeperReplicas: 1 +dataRootDir: /dockerdata-nfs image: readiness: oomk8s/readiness-check:1.1.0 dmaap: attos/dmaap:latest |