summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdnc/templates/statefulset.yaml
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-04-21 14:01:18 +0000
committerGerrit Code Review <gerrit@onap.org>2021-04-21 14:01:18 +0000
commit2c5df8df3b1e2741ab1242513791298216d0a9cf (patch)
tree9850d68ececb3be3fa6f4d991c09475978c7c4d3 /kubernetes/sdnc/templates/statefulset.yaml
parent6574e747618a67efdcc06dca930d3b36e8f94948 (diff)
parentfbf99d9ff51be6092fd8c37eab55e8f3bbd6b2eb (diff)
Merge "[SDNC] Change path to daexim directory" into guilin
Diffstat (limited to 'kubernetes/sdnc/templates/statefulset.yaml')
-rw-r--r--kubernetes/sdnc/templates/statefulset.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 7c499e90ab..2379b8423a 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -148,7 +148,6 @@ spec:
args:
- -c
- |
- mkdir {{ .Values.persistence.mdsalPath }}/daexim
mkdir {{ .Values.persistence.mdsalPath }}/journal
mkdir {{ .Values.persistence.mdsalPath }}/snapshots
mkdir {{ .Values.persistence.mdsalPath }}/daexim
@@ -295,10 +294,16 @@ spec:
- mountPath: {{ .Values.config.odl.etcDir }}/mountpoint-state-provider.properties
name: properties
subPath: mountpoint-state-provider.properties
+<<<<<<< HEAD (a66d33 Merge "[MUSIC] Update certificate" into guilin)
{{ if .Values.global.cmpv2Enabled }}
- mountPath: {{ .Values.global.platform.certServiceClient.envVariables.cert_path }}
name: certs
{{- end }}
+=======
+ - mountPath: {{ .Values.config.odl.etcDir }}/org.opendaylight.daexim.cfg
+ name: properties
+ subPath: org.opendaylight.daexim.cfg
+>>>>>>> CHANGE (a86300 Change path to daexim directory)
resources:
{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}