diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-04-22 07:09:56 +0000 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-04-22 07:09:56 +0000 |
| commit | ebb70d6f13f22ea386261e32e90b72d4007bd2ef (patch) | |
| tree | b0f28ddbcdc8ce1a0897734ab400d98b8255a09f | |
| parent | fbf99d9ff51be6092fd8c37eab55e8f3bbd6b2eb (diff) | |
Revert "[SDNC] Change path to daexim directory"
This reverts commit fbf99d9ff51be6092fd8c37eab55e8f3bbd6b2eb.
Reason for revert: Patch doesn't work on Guilin
Issue-ID: SDNC-1475
Change-Id: I0a7bac401b28c0ada83ace3265b9b4f1cb71970b
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
| -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, 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 92192ff982..91af687d04 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 chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.persistence.mdsalPath }} @@ -293,16 +294,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 |