From 8cae76ef66f1928b3d5afb9a67bb330c5cd513c4 Mon Sep 17 00:00:00 2001 From: YongchaoWu Date: Tue, 4 Jun 2019 08:34:39 +0000 Subject: Blueprint alignment Blueprint is aligned with the dmaap topic configuration Change-Id: I4303724eed21047b87a8b7438970625b08811d22 Issue-ID: DCAEGEN2-1145 Signed-off-by: YongchaoWu --- .../dpo/blueprints/k8s-datafile.yaml | 119 +++++++++------------ 1 file changed, 50 insertions(+), 69 deletions(-) (limited to 'datafile-app-server/dpo/blueprints/k8s-datafile.yaml') diff --git a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml index d1a2d4ea..1a855484 100644 --- a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml +++ b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml @@ -2,7 +2,7 @@ # # ============LICENSE_START==================================================== # ============================================================================= -# Copyright (C) 2019 Nordix Foundation. +# Copyright (c) 2018-2019 AT&T Intellectual Property, 2019 Nordix Foundation. All rights reserved. # ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,7 +21,8 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml" - - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R3/k8splugin/1.4.4/k8splugin_types.yaml" + - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.13/k8splugin_types.yaml" + - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml" inputs: dmaap_mr_host: @@ -32,100 +33,83 @@ inputs: type: integer description: dmaap messagerouter port default: 3904 - dmaap_mr_user: + dmaap_mr_protocol: type: string - description: dmaap messagerouter user name - default: "" - dmaap_mr_passwd: - type: string - description: dmaap messagerouter password - default: "" - dmaap_buscontroller_service_host: - type: string - description: DMAAP Bus Controller host address - default: "dmaap-bc.onap.svc.cluster.local" - dmaap_buscontroller_service_port: - type: string - description: DMAAP bus Controller host port - default: "6666" - dmaap_dr_feed_id: - type: string - description: ID of the data router feed that datafile will publish - default: "bulk_pm_feed" - dmaap_dr_host: - type: string - description: dmaap datarouter host - default: dmaap-dr-prov.onap.svc.cluster.local - dmaap_dr_port: - type: integer - description: dmaap datarouter port - default: 8443 - dmaap_dr_user: - type: string - description: dmaap datarouter user name - default: "dradmin" - dmaap_dr_passwd: - type: string - description: dmaap datarouter password - default: "dradmin" + description: dmaap messagerouter protocol + default: "http" tag_version: type: string - default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.2-SNAPSHOT" + description: DFC image tag/version + default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.2.0" replicas: type: integer description: number of instances default: 1 - host_port: - type: integer - description: port on Kubernetes host where datafile API will be exposed - default: 30223 - host_port_secure: - type: integer - description: secure port on Kubernetes host where datafile API will be exposed - default: 30224 secureEnableCert: type: boolean description: enable certificate base connection with PNF and DMaap default: false + feedName: + type: string + description: feed name for dmaap producerconfiguration + default: "bulk_pm_feed" + feedDescription: + type: string + default: "Feed for Bulk PM files" + changeIdentifier: + type: string + description: type of different files + default: "PM_MEAS_FILES" + node_templates: + bulk_pm_feed: + type: ccsdk.nodes.Feed + properties: + feed_name: { get_input: feedName } + feed_description: { get_input: feedDescription } + datafile-collector: + type: dcae.nodes.ContainerizedServiceComponentUsingDmaap + + relationships: + - type: ccsdk.relationships.publish_files + target: bulk_pm_feed + interfaces: cloudify.interfaces.lifecycle: start: inputs: ports: - - concat: ["8100:", { get_input: host_port }] - - concat: ["8433:", { get_input: host_port_secure}] + - concat: ["8100:0"] + - concat: ["8433:0"] + properties: + service_component_type: 'dcae-datafile' application_config: - dmaap.ftp.ftpesConfiguration.keyCert: "/config/dfc.jks" - dmaap.ftp.ftpesConfiguration.keyPassword: "secret" - dmaap.ftp.ftpesConfiguration.trustedCa: "/config/ftp.jks" - dmaap.ftp.ftpesConfiguration.trustedCaPassword: "secret" + dmaap.ftpesConfig.keyCert: "/opt/app/datafile/config/dfc.jks" + dmaap.ftpesConfig.keyPassword: "secret" + dmaap.ftpesConfig.trustedCa: "/opt/app/datafile/config/ftp.jks" + dmaap.ftpesConfig.trustedCaPassword: "secret" dmaap.security.trustStorePath: "/opt/app/datafile/etc/cert/trust.jks" dmaap.security.trustStorePasswordPath: "/opt/app/datafile/etc/cert/trust.pass" dmaap.security.keyStorePath: "/opt/app/datafile/etc/cert/key.p12" dmaap.security.keyStorePasswordPath: "/opt/app/datafile/etc/cert/key.pass" dmaap.security.enableDmaapCertAuth: { get_input: secureEnableCert } + dmaap.dmaapProducerConfiguration: + changeIdentifier: {get_input: changeIdentifier} + feedName: {get_input: feedName} streams_subscribes: dmaap_subscriber: type: "message_router" dmmap_info: topic_url: - "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/" - streams_publishes: - dmaap_publisher: - type: - "data_router" - dmaap_info: - username: - get_input: dmaap_dr_host - password: - get_input: dmaap_dr_passwd - publish_url: - { concat: ["http://", { get_input: dmaap_dr_user }, ".onap.svc.cluster.local", - ":",{get_input: dmaap_dr_port},"/publish"]} + { concat: [{ get_input: dmaap_mr_protocol },"://",{ get_input: dmaap_mr_host }, + ":",{ get_input: dmaap_mr_port },"/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"]} + streams_publishes: + - name: bulk_pm_feed + type: data_router + location: "loc00" docker_config: healthcheck: endpoint: /heartbeat @@ -135,11 +119,8 @@ node_templates: image: get_input: tag_version replicas: {get_input: replicas} - name: 'dcae-datafile-collector' - dns_name: 'dcae-datafile-collector' log_info: - log_directory: "/opt/app/datafile/logs" + log_directory: "/var/log/ONAP" tls_info: cert_directory: '/opt/app/datafile/etc/cert/' use_tls: true - type: dcae.nodes.ContainerizedPlatformComponent \ No newline at end of file -- cgit 1.2.3-korg