Merge "Change path to daexim directory"

diff --combined kubernetes/sdnc/templates/statefulset.yaml
index 51c50e4,2a36c0b..7441dac
--- 1/kubernetes/sdnc/templates/statefulset.yaml
--- 2/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@@ -114,7 -114,6 +114,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 }}
@@@ -203,9 -202,6 +202,9 @@@
            volumeMounts:
  {{ include "common.certInitializer.volumeMount" . | indent 10 }}
  {{ include "common.certServiceClient.volumeMounts" . | indent 10 }}
 +{{- if and .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration }}
 +{{ include "common.certManager.volumeMounts" . | indent 10 }}
 +{{- end }}
            - mountPath: /etc/localtime
              name: localtime
              readOnly: true
@@@ -264,6 -260,9 +263,9 @@@
            - mountPath: {{ .Values.config.odl.etcDir }}/mountpoint-state-provider.properties
              name: properties
              subPath: mountpoint-state-provider.properties
+           - 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 }}
@@@ -320,9 -319,6 +322,9 @@@
    {{ else }}
  {{ include "common.certInitializer.volumes" . | nindent 8 }}
  {{ include "common.certServiceClient.volumes" . | nindent 8 }}
 +{{- if and .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration }}
 +{{ include "common.certManager.volumes" . | nindent 8 }}
 +{{- end }}
    volumeClaimTemplates:
    - metadata:
        name: {{ include "common.fullname" . }}-data

diff --combined kubernetes/sdnc/values.yaml
index efc13e9,868a083..5a4d204
--- 1/kubernetes/sdnc/values.yaml
--- 2/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@@ -117,6 -117,10 +117,6 @@@ secrets
      login: '{{ .Values.config.scaleoutUser }}'
      password: '{{ .Values.config.scaleoutPassword }}'
      passwordPolicy: required
 -  - uid: keystore-password
 -    type: password
 -    password: secret
 -    passwordPolicy: required
  #################################################################
  # Certificates
  #################################################################
@@@ -125,16 -129,16 +125,16 @@@ certificates
      commonName: sdnc.simpledemo.onap.org
      dnsNames:
          - sdnc.simpledemo.onap.org
 -    p12Keystore:
 -      create: true
 -      passwordSecretRef:
 -        name: keystore-password
 -        key: password
 -    jksKeystore:
 -      create: true
 +    keystore:
 +      outputType:
 +        - jks
        passwordSecretRef:
 -        name: keystore-password
 +        name: sdnc-cmpv2-keystore-password
          key: password
 +    issuer:
 +      group: certmanager.onap.org
 +      kind: CMPv2Issuer
 +      name: cmpv2-issuer-onap
  #################################################################
  # Application configuration defaults.
  #################################################################
@@@ -460,7 -464,7 +460,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