From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Tue, 15 May 2018 19:51:10 +0000 (+0000)
Subject: Merge "Add separate PV for each SDN-C MYSQL pod"
X-Git-Tag: 2.0.0-ONAP~108
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=792b18625344b5ee726fa2b2137924dbd52fda22

Merge "Add separate PV for each SDN-C MYSQL pod"
---

792b18625344b5ee726fa2b2137924dbd52fda22
diff --cc kubernetes/sdnc/templates/statefulset.yaml
index f648d07c1f,05a5e7e965..83b7a7ce36
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@@ -89,29 -84,26 +89,29 @@@ spec
            - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
              name: sdnc-logging-cfg-config
              subPath: org.ops4j.pax.logging.cfg
 -          - mountPath: /opt/onap/sdnc/bin/startODL.sh
 -            name: startodl
 +          - mountPath: {{ .Values.config.binDir }}/startODL.sh
 +            name: bin
              subPath: startODL.sh
 -          - mountPath: /opt/onap/sdnc/bin/installSdncDb.sh
 -            name: installsdncdb
 +          - mountPath: {{ .Values.config.binDir }}/installSdncDb.sh
 +            name: bin
              subPath: installSdncDb.sh
 -          - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties
 -            name: aaiclient-conf
 +          - mountPath: {{ .Values.config.configDir }}/aaiclient.properties
 +            name: properties
              subPath: aaiclient.properties
 -          - mountPath: /opt/onap/sdnc/data/properties/dblib.properties
 -            name: sdnc-dblib-properties
 +          - mountPath: {{ .Values.config.configDir }}/dblib.properties
 +            name: properties
              subPath: dblib.properties
 -          - mountPath: /opt/onap/sdnc/data/properties/svclogic.properties
 -            name: sdnc-svclogic-config
 +          - mountPath: {{ .Values.config.configDir }}/lcm-dg.properties
 +            name: properties
 +            subPath: lcm-dg.properties
 +          - mountPath: {{ .Values.config.configDir }}/svclogic.properties
 +            name: properties
              subPath: svclogic.properties
            - mountPath: /opt/onap/sdnc/svclogic/config/svclogic.properties
 -            name: onap-sdnc-svclogic-config
 +            name: properties
              subPath: svclogic.properties
            - mountPath: {{ .Values.persistence.mdsalPath }}
-             name: {{ include "common.fullname" . }}-data
+             name: {{ include "common.fullname" . }}-mdsal
            - mountPath: /var/log/onap
              name: logs
            resources:
@@@ -153,16 -145,50 +153,16 @@@
          - name: sdnc-logging-cfg-config
            configMap:
              name: {{ include "common.fullname" . }}-log-configmap
 -        - name: startodl
 -          configMap:
 -            name: {{ include "common.fullname" . }}-startodl
 -            items:
 -            - key: startODL.sh
 -              path: startODL.sh
 -              mode: 0755
 -        - name: installsdncdb
 -          configMap:
 -            name: {{ include "common.fullname" . }}-installsdncdb
 -            items:
 -            - key: installSdncDb.sh
 -              path: installSdncDb.sh
 -              mode: 0755
 -        - name: aaiclient-conf
 -          configMap:
 -            name: {{ include "common.fullname" . }}-aaiclient-properties
 -            items:
 -            - key: aaiclient.properties
 -              path: aaiclient.properties
 -              mode: 0644
 -        - name: sdnc-dblib-properties
 -          configMap:
 -            name: {{ include "common.fullname" . }}-dblib-properties
 -            items:
 -            - key: dblib.properties
 -              path: dblib.properties
 -              mode: 0644
 -        - name: sdnc-svclogic-config
 +        - name: bin
            configMap:
 -            name: {{ include "common.fullname" . }}-svclogic-config
 -            items:
 -            - key: svclogic.properties
 -              path: svclogic.properties
 -              mode: 0644
 -        - name: onap-sdnc-svclogic-config
 +            name: {{ include "common.fullname" . }}-bin
 +            defaultMode: 0755
 +        - name: properties
            configMap:
 -            name: {{ include "common.fullname" . }}-onap-sdnc-svclogic-config
 -            items:
 -            - key: svclogic.properties
 -              path: svclogic.properties
 -              mode: 0644
 +            name: {{ include "common.fullname" . }}-properties
 +            defaultMode: 0644
    {{ if not .Values.persistence.enabled }}
-         - name: {{ include "common.fullname" . }}-data
+         - name: {{ include "common.fullname" . }}-mdsal
            emptyDir: {}
    {{ else }}
    volumeClaimTemplates: