Merge "[SDNC] Move ODL persistent data to pvc" into guilin

diff --combined kubernetes/sdnc/templates/statefulset.yaml
index 1f0a31a,cfeed36..91af687
--- 1/kubernetes/sdnc/templates/statefulset.yaml
--- 2/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@@ -141,15 -141,19 +141,19 @@@ spec
              name: certservice-tls-volume
        {{ end }}
  
-       - name: {{ include "common.name" . }}-chown
+       - name: {{ include "common.name" . }}-init-files
          image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }}
          command:
          - sh
          args:
          - -c
-         - chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.persistence.mdsalPath }}
+         - |
+            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 }}
  {{- if .Values.global.aafEnabled }}
-         - chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certInitializer.credsPath }}
+            chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certInitializer.credsPath }}
  {{- end }}
          volumeMounts:
  {{ include "common.certInitializer.volumeMount" . | indent 10 }}
@@@ -160,7 -164,7 +164,7 @@@
            image: "{{ include "common.repository" . }}/{{ .Values.image }}"
            imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
            command: ["/bin/bash"]
-           args: ["-c", "/opt/onap/sdnc/bin/startODL.sh"]
+           args: ["-c", "/opt/onap/sdnc/bin/createLinks.sh ; /opt/onap/sdnc/bin/startODL.sh"]
            ports:
            - containerPort: {{ .Values.service.internalPort }}
            - containerPort: {{ .Values.service.internalPort2 }}
@@@ -200,6 -204,14 +204,14 @@@
              value: "{{ .Values.replicaCount }}"
            - name: MYSQL_HOST
              value: {{ include "common.mariadbService" . }}
+           - name: MDSAL_PATH
+             value: {{ .Values.persistence.mdsalPath }}
+           - name: DAEXIM_PATH
+             value: {{ .Values.persistence.daeximPath }}
+           - name: JOURNAL_PATH
+             value: {{ .Values.persistence.journalPath }}
+           - name: SNAPSHOTS_PATH
+             value: {{ .Values.persistence.snapshotsPath }}
            - name: JAVA_HOME
              value: "{{ .Values.config.javaHome}}"
            - name: JAVA_OPTS
@@@ -233,6 -245,9 +245,9 @@@
            - mountPath: {{ .Values.config.binDir }}/installSdncDb.sh
              name: bin
              subPath: installSdncDb.sh
+           - mountPath: {{ .Values.config.binDir }}/createLinks.sh
+             name: bin
+             subPath: createLinks.sh
            - mountPath: {{ .Values.config.ccsdkConfigDir }}/aaiclient.properties
              name: properties
              subPath: aaiclient.properties
@@@ -267,9 -282,6 +282,9 @@@
            - mountPath: {{ .Values.config.odl.etcDir }}/org.opendaylight.controller.cluster.datastore.cfg
              name: properties
              subPath: org.opendaylight.controller.cluster.datastore.cfg
 +          - mountPath: {{ .Values.config.odl.etcDir }}/org.opendaylight.aaa.filterchain.cfg
 +            name: properties
 +            subPath: org.opendaylight.aaa.filterchain.cfg
            - mountPath: {{ .Values.config.odl.binDir }}/setenv
              name: properties
              subPath: setenv

diff --combined kubernetes/sdnc/values.yaml
index 1523fd5,62ea644..aab1edf
--- 1/kubernetes/sdnc/values.yaml
--- 2/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@@ -136,7 -136,7 +136,7 @@@ secrets
  
  repository: nexus3.onap.org:10001
  pullPolicy: Always
 -image: onap/sdnc-image:2.0.4
 +image: onap/sdnc-image:2.0.5
  busyboxRepository: docker.io
  busyboxImage: busybox:1.30
  
@@@ -193,7 -193,7 +193,7 @@@ config
      binDir: /opt/opendaylight/bin
      gcLogDir: /opt/opendaylight/data/log
      salConfigDir: /opt/opendaylight/system/org/opendaylight/controller/sal-clustering-config
 -    salConfigVersion: 1.9.1
 +    salConfigVersion: 1.10.4
      akka:
        seedNodeTimeout: 15s
        circuitBreaker:
@@@ -436,7 -436,10 +436,10 @@@ persistence
    size: 1Gi
    mountPath: /dockerdata-nfs
    mountSubPath: sdnc/mdsal
-   mdsalPath: /opt/opendaylight/current/daexim
+   mdsalPath: /opt/opendaylight/mdsal
+   daeximPath: /opt/opendaylight/daexim
+   journalPath: /opt/opendaylight/journal
+   snapshotsPath: /opt/opendaylight/snapshots
  
  certpersistence:
    enabled: true