X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Ftemplates%2Fstatefulset.yaml;fp=kubernetes%2Fsdnc%2Ftemplates%2Fstatefulset.yaml;h=7c499e90abedba1b22ad46027f1e5d5e9be19545;hb=66ca8e1cbaa9ebb1ef2c1e42607be75b33222703;hp=2379b8423abc529da5e1ec4e59ffaa1a2bebb898;hpb=2c5df8df3b1e2741ab1242513791298216d0a9cf;p=oom.git

diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 2379b8423a..7c499e90ab 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -148,6 +148,7 @@ spec:
         args:
         - -c
         - |
+           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
-<<<<<<< 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 }}