Merge "Revert "[SDNC] Change path to daexim directory"" into guilin

diff --combined kubernetes/sdnc/templates/statefulset.yaml
index 2379b84,91af687..7c499e9
--- 1/kubernetes/sdnc/templates/statefulset.yaml
--- 2/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@@ -148,9 -148,9 +148,10 @@@ spec
          args:
          - -c
          - |
+            mkdir {{ .Values.persistence.mdsalPath }}/daexim
             mkdir {{ .Values.persistence.mdsalPath }}/journal
             mkdir {{ .Values.persistence.mdsalPath }}/snapshots
 +           mkdir {{ .Values.persistence.mdsalPath }}/daexim
             chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.persistence.mdsalPath }}
  {{- if .Values.global.aafEnabled }}
             chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certInitializer.credsPath }}
@@@ -294,16 -294,10 +295,10 @@@
            - 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 }}