From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Fri, 9 Aug 2019 11:21:51 +0000 (+0000)
Subject: Merge "Add message-router dependency in blueprint-processor for kafka-listener."
X-Git-Tag: 5.0.1-ONAP~158
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b262964d2ffcc9e68bf3fa3e4da17b3911e0369c;hp=-c;p=oom.git

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

b262964d2ffcc9e68bf3fa3e4da17b3911e0369c
diff --combined kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
index ed9b24c94d,f628e2884d..02fe7b68a5
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
@@@ -14,30 -14,6 +14,30 @@@
  #  limitations under the License.
  #
  # Web server config
 +### START -Controller Blueprints Properties
 +# Load Resource Source Mappings
 +resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
 +
 +# Controller Blueprints Core Configuration
 +controllerblueprints.blueprintDeployPath=/opt/app/onap/blueprints/deploy
 +controllerblueprints.blueprintArchivePath=/opt/app/onap/blueprints/archive
 +controllerblueprints.blueprintWorkingPath=/opt/app/onap/blueprints/working
 +
 +# Controller Blueprint Load Configurations
 +# blueprints.load.initial-data may be overridden by ENV variables
 +controllerblueprints.loadInitialData=false
 +controllerblueprints.loadBluePrint=false
 +controllerblueprints.loadBluePrintPaths=/opt/app/onap/model-catalog/blueprint-model/service-blueprint
 +controllerblueprints.loadModelType=false
 +controllerblueprints.loadModeTypePaths=/opt/app/onap/model-catalog/definition-type/starter-type
 +controllerblueprints.loadResourceDictionary=false
 +controllerblueprints.loadResourceDictionaryPaths=/opt/app/onap/model-catalog/resource-dictionary/starter-dictionary
 +
 +# CBA file extension
 +controllerblueprints.loadCbaExtension=zip
 +
 +### END -Controller Blueprints Properties
 +
  blueprintsprocessor.grpcEnable=true
  blueprintsprocessor.httpPort=8080
  blueprintsprocessor.grpcPort=9111
@@@ -95,3 -71,15 +95,15 @@@ blueprintsprocessor.restclient.primary-
  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 --combined kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
index 64f2b27cdd,62dfeda8e4..ef7d8d4442
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
@@@ -36,6 -36,10 +36,10 @@@ spec
          args:
          - --container-name
          - cds-db
+         {{- if .Values.dmaapEnabled  }}
+         - --container-name
+         - message-router
+         {{ end }}
          env:
          - name: NAMESPACE
            valueFrom:
@@@ -60,7 -64,7 +64,7 @@@
            {{ if .Values.liveness.enabled }}
            livenessProbe:
              httpGet:
 -              path: /api/v1/execution-service/ping
 +              path: /api/v1/execution-service/health-check
                port: {{ .Values.service.http.internalPort }}
                httpHeaders:
                - name: Authorization
@@@ -70,7 -74,7 +74,7 @@@
            {{ end }}
            readinessProbe:
              httpGet:
 -              path: /api/v1/execution-service/ping
 +              path: /api/v1/execution-service/health-check
                port: {{ .Values.service.http.internalPort }}
                httpHeaders:
                - name: Authorization
@@@ -87,11 -91,6 +91,11 @@@
            - mountPath: {{ .Values.config.appConfigDir }}/logback.xml
              name: {{ include "common.fullname" . }}-config
              subPath: logback.xml
 +
 +          - mountPath: {{ .Values.config.appConfigDir }}/ONAP_RootCA.cer
 +            name: {{ include "common.fullname" . }}-config
 +            subPath: ONAP_RootCA.cer
 +
            - mountPath: {{ .Values.persistence.deployedBlueprint }}
              name: {{ include "common.fullname" . }}-blueprints
            resources: