From: Chengkai Yan <martin.c.yan@est.tech>
Date: Mon, 21 Jan 2019 07:23:42 +0000 (+0100)
Subject: Add new fields for application config
X-Git-Tag: 4.0.0-ONAP~17^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=cae9ebccfdb64595f9b7ab7a50ef80f8d09accc3;p=dcaegen2%2Fplatform%2Fblueprints.git

Add new fields for application config

Change-Id: I9a814e71b5e7e559cfc8313d65ec5e15d2520a09
Issue-ID: DCAEGEN2-1096
Signed-off-by: Chengkai Yan <martin.c.yan@est.tech>
---

diff --git a/blueprints/k8s-datafile-collector.yaml-template b/blueprints/k8s-datafile-collector.yaml-template
index 1f29df0..152c923 100644
--- a/blueprints/k8s-datafile-collector.yaml-template
+++ b/blueprints/k8s-datafile-collector.yaml-template
@@ -71,6 +71,10 @@ inputs:
     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
 node_templates:
   datafile-collector:
     interfaces:
@@ -104,6 +108,11 @@ node_templates:
         dmaap.ftp.ftpesConfiguration.keyPassword: "secret"
         dmaap.ftp.ftpesConfiguration.trustedCA: "/config/cacerts"
         dmaap.ftp.ftpesConfiguration.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 }
       docker_config:
         healthcheck:
           endpoint: /heartbeat
@@ -117,4 +126,7 @@ node_templates:
       dns_name: 'dcae-datafile-collector'
       log_info:
         log_directory: "/opt/app/datafile/logs"
+      tls_info:
+        cert_directory: '/opt/app/datafile/etc/cert/'
+        use_tls: true
     type: dcae.nodes.ContainerizedPlatformComponent