diff options
author | 2019-03-14 15:14:55 +0000 | |
---|---|---|
committer | 2019-03-14 15:14:55 +0000 | |
commit | 84e13d376c82b96f5dad949b3155478f8a421545 (patch) | |
tree | 917ba9aa7ec48ce42e727e66acd32e6059b35593 /datafile-app-server/dpo/blueprints | |
parent | a89e09eecabd035f1c227b1ae3f5fa59eff36be4 (diff) |
DataFile - Align Dmaap Topic configuration
Blueprints alignment
Configbinding service support
Modify the policy model complaint to R4 model expected by Policy
Change-Id: Ic53f4ab2a5867e5cdf0fc735be180715077154ee
Issue-ID: DCAEGEN2-1145
Signed-off-by: YongchaoWu <yongchao.wu@est.tech>
Diffstat (limited to 'datafile-app-server/dpo/blueprints')
-rw-r--r-- | datafile-app-server/dpo/blueprints/k8s-datafile.yaml | 66 |
1 files changed, 26 insertions, 40 deletions
diff --git a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml index 9d13f04f..075cf5e7 100644 --- a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml +++ b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml @@ -35,11 +35,11 @@ inputs: dmaap_mr_user: type: string description: dmaap messagerouter user name - default: "admin" + default: "" dmaap_mr_passwd: type: string description: dmaap messagerouter password - default: "admin" + default: "" dmaap_buscontroller_service_host: type: string description: DMAAP Bus Controller host address @@ -98,13 +98,31 @@ node_templates: - concat: ["8433:", { get_input: host_port_secure}] properties: application_config: + dmmap.dmaapConsumerConfiguration.dmaapHostName: {get_input: dmaap_mr_host} + dmmap.dmaapConsumerConfiguration.dmaapPortNumber: {get_input: dmaap_mr_port} + dmmap.dmaapConsumerConfiguration.dmaapTopicName: "/events/unauthenticated.VES_NOTIFICATION_OUTPUT" + dmmap.dmaapConsumerConfiguration.dmaapProtocol: "http" + dmmap.dmaapConsumerConfiguration.dmaapUserName: {get_input: dmaap_mr_user} + dmmap.dmaapConsumerConfiguration.dmaapUserPassword: {get_input: dmaap_mr_passwd } + dmmap.dmaapConsumerConfiguration.dmaapContentType: "application/json" + dmmap.dmaapConsumerConfiguration.consumerId: "C12" + dmmap.dmaapConsumerConfiguration.consumerGroup: "OpenDCAE-c12" + dmmap.dmaapConsumerConfiguration.timeoutMs: "-1" + dmmap.dmaapConsumerConfiguration.messageLimit: "1" + dmmap.dmaapProducerConfiguration.dmaapHostName: {get_input: dmaap_dr_host} + dmmap.dmaapProducerConfiguration.dmaapPortNumber: {get_input: dmaap_dr_port} + dmmap.dmaapProducerConfiguration.dmaapTopicName: "publish" + dmmap.dmaapProducerConfiguration.dmaapProtocol: "https" + dmmap.dmaapProducerConfiguration.dmaapUserName: {get_input: dmaap_dr_user} + dmmap.dmaapProducerConfiguration.dmaapUserPassword: {get_input: dmaap_dr_passwd} + dmmap.dmaapProducerConfiguration.dmaapContentType: "application/octet-stream" dmaap.dmaapBusControllerConfiguration.dmaapHostName: {get_input: dmaap_buscontroller_service_host} dmaap.dmaapBusControllerConfiguration.dmaapPortNumber: {get_input: dmaap_buscontroller_service_port} dmaap.dmaapBusControllerConfiguration.dmaapTopicName: "webapi/feeds" dmaap.dmaapBusControllerConfiguration.dmaapDrFeedName: {get_input: dmaap_dr_feed_id} dmaap.dmaapBusControllerConfiguration.dmaapProtocol: "https" - dmaap.dmaapBusControllerConfiguration.dmaapUserName: "dbcadmin" - dmaap.dmaapBusControllerConfiguration.dmaapUserPassword: "dbcadmin" + dmaap.dmaapBusControllerConfiguration.dmaapUserName: "dradmin" + dmaap.dmaapBusControllerConfiguration.dmaapUserPassword: "dradmin" dmaap.dmaapBusControllerConfiguration.dmaapContentType: "application/json" dmaap.ftp.ftpesConfiguration.keyCert: "/config/ftpKey.jks" dmaap.ftp.ftpesConfiguration.keyPassword: "secret" @@ -120,47 +138,15 @@ node_templates: type: "message_router" dmmap_info: - dmaapHostName: - get_input: dmaap_mr_host - dmaapPortNumber: - get_input: dmaap_mr_port - dmaapTopicName: - "/events/unauthenticated.VES_NOTIFICATION_OUTPUT" - dmaapProtocol: - "http" - dmaapUserName: - get_input: dmaap_mr_user - dmaapUserPassword: - get_input: dmaap_mr_passwd - dmaapContentType: - "application/json" - consumerId: - "C12" - consumerGroup: - "OpenDCAE-c12" - timeoutMs: - -1 - messageLimit: - -1 + topic_url: + "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT" streams_publishes: dmaap_publisher: type: "data_router" dmaap_info: - dmaapHostName: - get_input: dmaap_dr_host - dmaapPortNumber: - get_input: dmaap_dr_port - dmaapTopicName: - "publish" - dmaapProtocol: - "https" - dmaapUserName: - get_input: dmaap_dr_user - dmaapUserPassword: - get_input: dmaap_dr_passwd - dmaapContentType: - "application/octet-stream" + publish_url: + "" docker_config: healthcheck: endpoint: /heartbeat |