Add HTTPS to DFC

- update blueprint config and DFC version

Issue-ID: DCAEGEN2-2528
Signed-off-by: Krzysztof Gajewski <krzysztof.gajewski@nokia.com>
Change-Id: Id4cd7d42972acb07632ff4a025b8708bec63d1b6

diff --git a/Changelog.md b/Changelog.md
index 4bc1409..d160dc3 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [3.0.2] - 2021-02-15
 ### Changed
 - [DCAEGEN2-2628](https://jira.onap.org/browse/DCAEGEN2-2628) - Fix docker image build problem
+- [DCAEGEN2-2528](https://jira.onap.org/browse/DCAEGEN2-2528) - Add HTTPS as new protocol to collect files from xNFs
 
 ## [3.0.1] - 11/02/2021
 ### Changed

diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml
index c545b13..7ac823e 100644 (file)
--- a/blueprints/k8s-datafile.yaml
+++ b/blueprints/k8s-datafile.yaml
@@ -53,7 +53,7 @@ inputs:
     default: 1
   tag_version:
     type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.5.0"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.5.3"
   use_tls:
     type: boolean
     default: true
@@ -95,10 +95,10 @@ node_templates:
           PM_MEAS_FILES:
             dmaap_info: <<feed0>>
             type: data_router
-        dmaap.ftpesConfig.keyCert: /opt/app/datafile/etc/cert/cert.p12
-        dmaap.ftpesConfig.keyPasswordPath: /opt/app/datafile/etc/cert/p12.pass
-        dmaap.ftpesConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
-        dmaap.ftpesConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+        dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.p12
+        dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/p12.pass
+        dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+        dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
         dmaap.security.enableDmaapCertAuth: true
         dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
         dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks