aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-02-27 13:11:21 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-27 13:11:21 +0000
commit7be18bf143461e4905bceb9a486326723cfe4fcf (patch)
tree0059a29e8e582833a22db074bec4e8f44530368d
parent6b94010f3a56b7244b530f08383027f7b759f80b (diff)
parentf4a61d8851f9a149b1152a68849626ea1ef8e09f (diff)
Merge "multicloud persistence folder parametrization"
-rw-r--r--kubernetes/multicloud/templates/framework-deployment.yaml4
-rw-r--r--kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml4
-rw-r--r--kubernetes/multicloud/templates/multicloud-vio-deployment.yaml4
-rw-r--r--kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml4
-rw-r--r--kubernetes/multicloud/values.yaml1
5 files changed, 9 insertions, 8 deletions
diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml
index b2f23715c8..f585b04787 100644
--- a/kubernetes/multicloud/templates/framework-deployment.yaml
+++ b/kubernetes/multicloud/templates/framework-deployment.yaml
@@ -53,7 +53,7 @@ spec:
volumes:
- name: framework-log
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/framework/logs
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/multicloud/framework/logs
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
index 994fe94c03..9999b5585d 100644
--- a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
@@ -53,7 +53,7 @@ spec:
volumes:
- name: ocata-log
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/ocata/logs
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/multicloud/ocata/logs
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
index e2274b358f..c5efdae559 100644
--- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml
@@ -53,7 +53,7 @@ spec:
volumes:
- name: vio-log
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/vio/logs
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/multicloud/vio/logs
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
index ff0f09af19..c482aea7fd 100644
--- a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
@@ -53,7 +53,7 @@ spec:
volumes:
- name: windriver-log
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/multicloud/windriver/logs
+ path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/multicloud/windriver/logs
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 0379ea17ab..5d9144a146 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -1,6 +1,7 @@
nsPrefix: onap
pullPolicy: Always
nodePortPrefix: 302
+dataRootDir: /dockerdata-nfs
image:
readiness: oomk8s/readiness-check:1.1.0
framework: nexus3.onap.org:10001/onap/multicloud/framework:v1.0.0