summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdnc
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-04-21 14:01:18 +0000
committerGerrit Code Review <gerrit@onap.org>2021-04-21 14:01:18 +0000
commit2c5df8df3b1e2741ab1242513791298216d0a9cf (patch)
tree9850d68ececb3be3fa6f4d991c09475978c7c4d3 /kubernetes/sdnc
parent6574e747618a67efdcc06dca930d3b36e8f94948 (diff)
parentfbf99d9ff51be6092fd8c37eab55e8f3bbd6b2eb (diff)
Merge "[SDNC] Change path to daexim directory" into guilin
Diffstat (limited to 'kubernetes/sdnc')
-rw-r--r--kubernetes/sdnc/resources/config/conf/org.opendaylight.daexim.cfg4
-rw-r--r--kubernetes/sdnc/templates/statefulset.yaml7
-rw-r--r--kubernetes/sdnc/values.yaml2
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 7c499e90ab..2379b8423a 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
@@ -295,10 +294,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