aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2018-10-17 19:34:49 +0000
committerBorislav Glozman <Borislav.Glozman@amdocs.com>2018-10-18 07:05:43 +0000
commitec0918d6eeefdba962699e121240f532cb26b66c (patch)
tree76fd59ca2b6e15747c2aa90a4e277f1a635a1ea8
parent8234007f37c917b1334a1613f90ca61d85c24cdc (diff)
Corrections and additions
Change-Id: I3b0a7ee34dcae30cdc1faa42e05455aa4e693df6 Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-829
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json10
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml6
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