summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrathamesh Morde <prathamesh.morde@bell.ca>2019-06-24 10:36:15 -0400
committerYuriy Malakov <Yuriy.Malakov@att.com>2019-08-09 13:03:00 +0000
commit1ac632ddbd15a11b00737b33536a8fc71c2cf502 (patch)
treed355b0251e51a0694c9f2e2093cd10198ceb2c5e
parent64b209220eae53dfeaa1662f7f3d7c95b6bf902a (diff)
Add message-router dependency in blueprint-processor for kafka-listener.
Issue-ID: CCSDK-1432 Signed-off-by: Prathamesh Morde <prathamesh.morde@bell.ca> Change-Id: I64349580b66979285857951ea6d6f18015ef63f5 Signed-off-by: Prathamesh Morde <prathamesh.morde@bell.ca> Signed-off-by: Prathamesh Morde <prathamesh_morde@yahoo.ca> (cherry picked from commit 93da127349566d0ba8658f4bb1d12dbe5c791a59)
-rwxr-xr-xkubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties12
-rwxr-xr-xkubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml4
-rwxr-xr-xkubernetes/cds/charts/cds-blueprints-processor/values.yaml5
3 files changed, 20 insertions, 1 deletions
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
index 1317300570..f628e2884d 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
@@ -71,3 +71,15 @@ blueprintsprocessor.restclient.primary-aai-data.url=https://aai.onap:8443
blueprintsprocessor.restclient.primary-aai-data.username=aai@aai.onap.org
blueprintsprocessor.restclient.primary-aai-data.password=demo123456!
+# Kafka-message-lib Configuration
+blueprintsprocessor.messageclient.self-service-api.topic=cds-producer
+blueprintsprocessor.messageclient.self-service-api.type=kafka-basic-auth
+
+##ONAP Message Router Kafka Service##
+blueprintsprocessor.messageclient.self-service-api.bootstrapServers=message-router-kafka:9092
+
+blueprintsprocessor.messageclient.self-service-api.consumerTopic=cds-consumer
+blueprintsprocessor.messageclient.self-service-api.groupId=cds-consumer-group
+blueprintsprocessor.messageclient.self-service-api.clientId=cds-client
+blueprintsprocessor.messageclient.self-service-api.kafkaEnable=false
+
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml b/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
index 95069fcbff..d4c106b6b2 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
@@ -36,6 +36,10 @@ spec:
args:
- --container-name
- cds-db
+ {{- if .Values.dmaapEnabled }}
+ - --container-name
+ - message-router
+ {{ end }}
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
index 01c629ef7f..cf1b3d4bf8 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
@@ -57,6 +57,10 @@ nodeSelector: {}
affinity: {}
+# flag for kafka-listener dependency. Set to true if you are using message-router otherwise set to false if you are using
+# custom kafka cluster.
+dmaapEnabled: true
+
# probe configuration parameters
liveness:
initialDelaySeconds: 120
@@ -82,7 +86,6 @@ service:
internalPort: 9111
externalPort: 9111
-
persistence:
volumeReclaimPolicy: Retain
accessMode: ReadWriteMany