X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdmaap%2Fcomponents%2Fdmaap-dr-prov%2Ftemplates%2Fdeployment.yaml;h=b9c144de727e171e10a701b20c30d693c15208fa;hb=6065d3e7f62ce545cd04d8ee7c25b0fe514c7ef1;hp=573e90c35af3440c34606e2c7265a1e00f5674eb;hpb=38e1c1a9740657b3032eca31441eed34f11b30f4;p=oom.git

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
index 573e90c35a..b9c144de72 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml
@@ -69,10 +69,13 @@ spec:
             name: localtime
             readOnly: false
           - mountPath: /opt/app/datartr/etc/provserver.properties
+            name: {{ include "common.fullname" . }}-config
             subPath: provserver.properties
-            name: prov-props
-          - name: {{ include "common.fullname" . }}-logs
-            mountPath: {{ .Values.global.loggingDirectory }}
+          - mountPath: /opt/app/datartr/etc/drProvCadi.properties
+            name: {{ include "common.fullname" . }}-config
+            subPath: drProvCadi.properties
+          - mountPath: {{ .Values.global.loggingDirectory }}
+            name: {{ include "common.fullname" . }}-logs
           resources:
 {{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
@@ -84,7 +87,7 @@ spec:
 {{ toYaml .Values.affinity | indent 10 }}
         {{- end }}
         # Filebeat sidecar container
-        - name: {{ include "common.fullname" . }}-filebeat-onap
+        - name: {{ include "common.name" . }}-filebeat-onap
           image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
@@ -99,15 +102,20 @@ spec:
       - name: localtime
         hostPath:
           path: /etc/localtime
-      - name: prov-props
+      - name: {{ include "common.fullname" . }}-config
         configMap:
-          name: {{ include "common.fullname" . }}-prov-props-configmap
+          name: {{ include "common.fullname" . }}-configmap
+          items:
+          - key: provserver.properties
+            path: provserver.properties
+          - key: drProvCadi.properties
+            path: drProvCadi.properties
       - name: {{ include "common.fullname" . }}-log-conf
         configMap:
           name: {{ include "common.fullname" . }}-log
       - name: {{ include "common.fullname" . }}-filebeat-conf
         configMap:
-          name: {{ include "common.fullname" . }}-dmaap-filebeat-configmap
+          name: {{ .Release.Name }}-dmaap-filebeat-configmap
       - name: {{ include "common.fullname" . }}-data-filebeat
         emptyDir: {}
       - name:  {{ include "common.fullname" . }}-logs