Merge "Add message-router dependency in blueprint-processor for kafka-listener."

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 ed9b24c..02fe7b6 100755 (executable)
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
@@ -95,3 +95,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 64f2b27..ef7d8d4 100755 (executable)
--- 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 a2e3da6..dfe914e 100755 (executable)
--- 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