X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Fcharts%2Fdmaap-listener%2Ftemplates%2Fdeployment.yaml;h=03169427f019ea02648afd8944a56e5eeb6173db;hb=b76cb2810fc083b6151652083a416989680f17e7;hp=e712a410c8004d2f1b0d66fbeedbee32a0a31810;hpb=15519cd4f31a4b52ff9c397ac186532345912caf;p=oom.git

diff --git a/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml b/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml
index e712a410c8..03169427f0 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/templates/deployment.yaml
@@ -35,9 +35,11 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - {{ .Values.config.mysqlChartName }}
+        - {{ .Values.config.mariadbGalera.chartName }}
         - --container-name
         - {{ .Values.config.sdncChartName }}
+        - --container-name
+        - {{ .Values.config.msgRouterContainerName }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -51,7 +53,7 @@ spec:
       - command:
         - /opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh
         name: {{ include "common.name" . }}
-        image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: PROPERTY_DIR
@@ -62,11 +64,20 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
+        - mountPath: {{ .Values.config.configDir }}/dblib.properties
+          name: properties
+          subPath: dblib.properties
         - mountPath: {{ .Values.config.configDir }}/dhcpalert.properties
+          name: properties
           subPath: dhcpalert.properties
-          name: dmaap-dhcapalert-config
+        - mountPath: {{ .Values.config.configDir }}/lcm.properties
+          name: properties
+          subPath: lcm.properties
+        - mountPath: {{ .Values.config.configDir }}/aai.properties
+          name: properties
+          subPath: aai.properties
         resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
@@ -80,8 +91,9 @@ spec:
         - name: localtime
           hostPath:
             path: /etc/localtime
-        - name: dmaap-dhcapalert-config
+        - name: properties
           configMap:
-            name: sdnc-dmaap-configmap
+            name: {{ include "common.fullname" . }}
+            defaultMode: 0644
       imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"