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

diff --git a/kubernetes/sdnc/resources/config/conf/org.opendaylight.daexim.cfg b/kubernetes/sdnc/resources/config/conf/org.opendaylight.daexim.cfg
deleted file mode 100644 (file)
index 20b794d..0000000
--- a/kubernetes/sdnc/resources/config/conf/org.opendaylight.daexim.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# Daexim directory location
-# absolute path or path relative to Karaf home directory
-# property substitution (interpolation) currently only supported for "${karaf.home}", no others (hard-coded) -- M.
-daexim.dir={{ .Values.persistence.daeximPath }}
\ No newline at end of file

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
         - |
+           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 }}

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 30132d7..aab1edf 100644 (file)
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -437,7 +437,7 @@ persistence:
   mountPath: /dockerdata-nfs
   mountSubPath: sdnc/mdsal
   mdsalPath: /opt/opendaylight/mdsal
-  daeximPath: /opt/opendaylight/mdsal/daexim
+  daeximPath: /opt/opendaylight/daexim
   journalPath: /opt/opendaylight/journal
   snapshotsPath: /opt/opendaylight/snapshots