summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2021-04-22 07:27:05 +0000
committerGerrit Code Review <gerrit@onap.org>2021-04-22 07:27:05 +0000
commit66ca8e1cbaa9ebb1ef2c1e42607be75b33222703 (patch)
tree93a06e15936901ab577e2b5e304658f13d2823f3 /kubernetes
parent2c5df8df3b1e2741ab1242513791298216d0a9cf (diff)
parentebb70d6f13f22ea386261e32e90b72d4007bd2ef (diff)
Merge "Revert "[SDNC] Change path to daexim directory"" into guilin
Diffstat (limited to 'kubernetes')
-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, 2 insertions, 11 deletions
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
index 20b794d21f..0000000000
--- 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 2379b8423a..7c499e90ab 100644
--- 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 30132d7db7..aab1edfee3 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/mdsal/daexim
+ daeximPath: /opt/opendaylight/daexim
journalPath: /opt/opendaylight/journal
snapshotsPath: /opt/opendaylight/snapshots