From ec0918d6eeefdba962699e121240f532cb26b66c Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Wed, 17 Oct 2018 19:34:49 +0000 Subject: [PATCH] Corrections and additions Change-Id: I3b0a7ee34dcae30cdc1faa42e05455aa4e693df6 Signed-off-by: dglFromAtt Issue-ID: DMAAP-829 --- .../charts/dmaap-bus-controller/resources/feeds/DefaultPM.json | 10 +++++++++- .../charts/dmaap-bus-controller/templates/deployment.yaml | 6 ++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json index e8073474b1..411d7f41e1 100644 --- a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json +++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json @@ -3,6 +3,14 @@ "feedVersion": "m1.1", "feedDescription": "Default feed provisioned for PM File collector", "asprClassification" : "unclassified", - "owner": "onap" + "owner": "onap", + "pubs": [ + { + "dcaeLocationName" : "san-francisco", + "username": "dradmin", + "userpwd": "dradmin" + } + + ] } diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml index c2c72a421e..8ef03d43a9 100644 --- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml +++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml @@ -59,7 +59,7 @@ spec: port: {{ .Values.service.internalPort }} path: /webapi/info initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.liveness.periodSeconds }} + periodSeconds: {{ .Values.liveness.periodSeconds }} readinessProbe: httpGet: port: {{ .Values.service.internalPort }} @@ -71,9 +71,11 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true + +# NOTE: on the following several configMaps, careful to include / at end +# since there may be more than one file in each mountPath - name: {{ include "common.name" . }}-config mountPath: /opt/app/config/conf/ -# subPath: buscontroller.env # NOTE: the basename of the subdirectory is important - it matches the DBCL API URI - name: {{ include "common.name" . }}-dmaap -- 2.16.6