diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-02-27 13:11:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-27 13:11:31 +0000 |
| commit | db7502c5fb72c5876457a0fe3c2abf45ceeee5f8 (patch) | |
| tree | 783d3d98ff1e4fa4e379cc96d881c6e1a443ea9c | |
| parent | 43e96d6173660f609fdb1d7705a1a19c81b5fbcc (diff) | |
| parent | 2dabc18ef15b60e67ad0301cf1c782e73b168205 (diff) | |
Merge "portal persistence folder parametrization"
| -rwxr-xr-x | kubernetes/portal/templates/portal-apps-deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/portal/templates/portal-pv-pvc.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/portal/values.yaml | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml index c6a38bd4cf..068e0f7564 100755 --- a/kubernetes/portal/templates/portal-apps-deployment.yaml +++ b/kubernetes/portal/templates/portal-apps-deployment.yaml @@ -142,10 +142,10 @@ spec: name: portal-mariadb-configmap - name: portal-root hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/portal - name: portal-logs hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/logs + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/portal/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/portal/templates/portal-pv-pvc.yaml b/kubernetes/portal/templates/portal-pv-pvc.yaml index b4d2baa334..0fabc4cc26 100644 --- a/kubernetes/portal/templates/portal-pv-pvc.yaml +++ b/kubernetes/portal/templates/portal-pv-pvc.yaml @@ -13,7 +13,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/data + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/portal/mariadb/data --- kind: PersistentVolumeClaim apiVersion: v1 @@ -29,4 +29,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-portal-db" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml index 2596d5ed3b..abac400ba3 100644 --- a/kubernetes/portal/values.yaml +++ b/kubernetes/portal/values.yaml @@ -5,6 +5,7 @@ portalAppsReplicas: 1 portalDbReplicas: 1 vncPortalReplicas: 1 portalWidgetsReplicas: 1 +dataRootDir: /dockerdata-nfs image: readiness: oomk8s/readiness-check:1.1.0 portalapps: nexus3.onap.org:10001/onap/portal-apps:v1.3.0 |