Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Revert "[SDNC] Change path to daexim directory"" into guilin
[oom.git]
/
kubernetes
/
sdnc
/
templates
/
statefulset.yaml
diff --git
a/kubernetes/sdnc/templates/statefulset.yaml
b/kubernetes/sdnc/templates/statefulset.yaml
index
2379b84
..
7c499e9
100644
(file)
--- a/
kubernetes/sdnc/templates/statefulset.yaml
+++ b/
kubernetes/sdnc/templates/statefulset.yaml
@@
-148,6
+148,7
@@
spec:
args:
- -c
- |
args:
- -c
- |
+ mkdir {{ .Values.persistence.mdsalPath }}/daexim
mkdir {{ .Values.persistence.mdsalPath }}/journal
mkdir {{ .Values.persistence.mdsalPath }}/snapshots
mkdir {{ .Values.persistence.mdsalPath }}/daexim
mkdir {{ .Values.persistence.mdsalPath }}/journal
mkdir {{ .Values.persistence.mdsalPath }}/snapshots
mkdir {{ .Values.persistence.mdsalPath }}/daexim
@@
-294,16
+295,10
@@
spec:
- mountPath: {{ .Values.config.odl.etcDir }}/mountpoint-state-provider.properties
name: properties
subPath: mountpoint-state-provider.properties
- 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 }}
{{ 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 }}
resources:
{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}