From 8b47d21863a8d9669ddb3a330c2c3d76c6b065a3 Mon Sep 17 00:00:00 2001 From: YongchaoWu Date: Mon, 18 Mar 2019 14:17:02 +0000 Subject: Fix DataFile - Align Dmaap Topic configuration Remove additional configuration in Blueprints Remove additional configruation in component specs Change-Id: I0d546227af0be485f2ffed27a93c701a7654ff8e Issue-ID: DCAEGEN2-1145 Signed-off-by: YongchaoWu --- datafile-app-server/dpo/tosca_models/template.yaml | 26 ---------------------- 1 file changed, 26 deletions(-) (limited to 'datafile-app-server/dpo/tosca_models/template.yaml') diff --git a/datafile-app-server/dpo/tosca_models/template.yaml b/datafile-app-server/dpo/tosca_models/template.yaml index a8621b40..e31b538b 100644 --- a/datafile-app-server/dpo/tosca_models/template.yaml +++ b/datafile-app-server/dpo/tosca_models/template.yaml @@ -15,33 +15,7 @@ topology_template: dcaegen2.collectors.datafile.datafile-app-server: type: tosca.dcae.nodes.dockerApp.dcaegen2.collectors.datafile.datafile-app-server properties: - buscontroller_feed_publishing_endpoint: http://dmaap-bc.onap.svc.cluster.local:8080/webapi/feeds datafile.policy: '' - dmaap.dmaapBusControllerConfiguration.dmaapContentType: application/json - dmaap.dmaapBusControllerConfiguration.dmaapDrFeedName: bulk_pm_feed - dmaap.dmaapBusControllerConfiguration.dmaapHostName: localhost - dmaap.dmaapBusControllerConfiguration.dmaapPortNumber: '6666' - dmaap.dmaapBusControllerConfiguration.dmaapProtocol: https - dmaap.dmaapBusControllerConfiguration.dmaapTopicName: webapis/feeds - dmaap.dmaapBusControllerConfiguration.dmaapUserName: dbcadmin - dmaap.dmaapBusControllerConfiguration.dmaapUserPassword: dbcadmin - dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12 - dmaap.dmaapConsumerConfiguration.consumerId: C12 - dmaap.dmaapConsumerConfiguration.dmaapContentType: application/json - dmaap.dmaapConsumerConfiguration.dmaapHostName: localhost - dmaap.dmaapConsumerConfiguration.dmaapPortNumber: '2222' - dmaap.dmaapConsumerConfiguration.dmaapProtocol: http - dmaap.dmaapConsumerConfiguration.dmaapTopicName: /events/unauthenticated.VES_NOTIFICATION_OUTPUT - dmaap.dmaapConsumerConfiguration.messageLimit: '1' - dmaap.dmaapConsumerConfiguration.timeoutMs: '-1' - dmaap.dmaapProducerConfiguration.dmaapContentType: application/octet-stream - dmaap.dmaapProducerConfiguration.dmaapHostName: localhost - dmaap.dmaapProducerConfiguration.dmaapPortNumber: '3907' - dmaap.dmaapProducerConfiguration.dmaapProtocol: https - dmaap.dmaapProducerConfiguration.dmaapTopicName: publish - dmaap.dmaapProducerConfiguration.dmaapUserName: dradmin - dmaap.dmaapProducerConfiguration.dmaapUserPassword: dradmin - dmaap_dr_feed_id: bulk_pm_feed ftp.ftpesConfiguration.keyCert: config/dfc.jks ftp.ftpesConfiguration.keyPassword: secret ftp.ftpesConfiguration.trustedCA: config/ftp.jks -- cgit 1.2.3-korg