diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-05-07 05:27:56 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2021-05-07 05:27:56 +0000 |
commit | d540a719a70de05f462a07249ab16de099d8b670 (patch) | |
tree | ed9837a7ea28c47619ecf60fcf4754bf3a54b4ac | |
parent | 4baa65ffb12fd5343a7cb29f7f7e70885de9aeff (diff) | |
parent | d1a11336ed90bdbdb045e7102cf4a4f6f2ffafd7 (diff) |
Merge "[SDNC] Change path to daexim directory - guilin" into guilin
-rw-r--r-- | kubernetes/sdnc/resources/config/conf/org.opendaylight.daexim.cfg | 4 | ||||
-rw-r--r-- | kubernetes/sdnc/templates/statefulset.yaml | 4 | ||||
-rw-r--r-- | kubernetes/sdnc/values.yaml | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/kubernetes/sdnc/resources/config/conf/org.opendaylight.daexim.cfg b/kubernetes/sdnc/resources/config/conf/org.opendaylight.daexim.cfg new file mode 100644 index 0000000000..20b794d21f --- /dev/null +++ b/kubernetes/sdnc/resources/config/conf/org.opendaylight.daexim.cfg @@ -0,0 +1,4 @@ +# 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 7c499e90ab..c832921964 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 @@ -299,6 +298,9 @@ spec: - 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 resources: {{ include "common.resources" . | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index aab1edfee3..30132d7db7 100644 --- 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/daexim + daeximPath: /opt/opendaylight/mdsal/daexim journalPath: /opt/opendaylight/journal snapshotsPath: /opt/opendaylight/snapshots |