diff options
| author |   demskeq8 <alexander.dehn@highstreet-technologies.com> | 2021-02-10 09:53:33 +0100 |
|---|---|---|
| committer |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-04-19 07:17:54 +0000 |
| commit | fbf99d9ff51be6092fd8c37eab55e8f3bbd6b2eb (patch) | |
| tree | 4e6121a0adfb8e456380deb71ced74c6e32b153c | |
| parent | 340267ab46f41493c1509b9d77a3ccbdb529eb27 (diff) | |
[SDNC] Change path to daexim directory
configure absolut path for daexim persistent directory.
Issue-ID: SDNC-1475
Signed-off-by: demskeq8 <alexander.dehn@highstreet-technologies.com>
Change-Id: I1cfc348b733dee2e02b1a0193f6cba3c78e61d91
(cherry picked from commit a86300a336804e64a26dea576aa9d44f699eb6e2)
| -rw-r--r-- | kubernetes/sdnc/resources/config/conf/org.opendaylight.daexim.cfg | 4 | ||||
| -rw-r--r-- | kubernetes/sdnc/templates/statefulset.yaml | 7 | ||||
| -rw-r--r-- | kubernetes/sdnc/values.yaml | 2 |
3 files changed, 11 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 91af687d04..92192ff982 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 chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.persistence.mdsalPath }} @@ -294,10 +293,16 @@ 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 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 |