summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Malkiewicz <jan.malkiewicz@nokia.com>2020-07-23 14:54:17 +0200
committerRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2020-09-02 10:24:22 +0200
commitc60d453a22e588efc1ab869ce9a920ed959b818c (patch)
treeaa620ebcaf15fd358f1ca0d3e8e1a3b60286f349
parent4fbcea532be594e778220f0e188d5d5cc5b51b04 (diff)
Add sftp strict host key checking to DFC. Update config for newer
SDK. Issue-ID: DCAEGEN2-2219 Issue-ID: DCAEGEN2-2378 Issue-ID: DCAEGEN2-2267 Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com> Change-Id: I5c203e460d986574197162e987e73e888398e686 Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
-rw-r--r--.gitignore11
-rw-r--r--blueprints/k8s-datafile.yaml24
2 files changed, 24 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index aa7a830..ea6a32a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,12 @@
+### IntelliJ IDEA ###
+.idea
+k8s-bootstrap-container.iml
+
+### Visual Studio ###
.project
-Dockerfile
.vscode
bootstrap-container.code-workspace
-target \ No newline at end of file
+
+Dockerfile
+
+target
diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml
index 5ddb132..535a7db 100644
--- a/blueprints/k8s-datafile.yaml
+++ b/blueprints/k8s-datafile.yaml
@@ -23,10 +23,10 @@ inputs:
default: "250m"
datafile-collector_memory_limit:
type: string
- default: "256Mi"
+ default: "512Mi"
datafile-collector_memory_request:
type: string
- default: "256Mi"
+ default: "512Mi"
envs:
default: {}
external_port:
@@ -53,10 +53,10 @@ inputs:
default: 1
tag_version:
type: string
- default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.3.0"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.4.3"
use_tls:
type: boolean
- default: false
+ default: true
node_templates:
datafile-collector:
type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
@@ -73,20 +73,26 @@ node_templates:
PM_MEAS_FILES:
dmaap_info: <<feed0>>
type: data_router
- streams_subscribes: {}
dmaap.ftpesConfig.keyCert: /opt/app/datafile/config/cert.jks
dmaap.ftpesConfig.keyPasswordPath: /opt/app/datafile/config/jks.pass
dmaap.ftpesConfig.trustedCa: /opt/app/datafile/config/trust.jks
dmaap.ftpesConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
- dmaap.security.enableDmaapCertAuth: false
- dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/key.pass
- dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/key.p12
+ dmaap.security.enableDmaapCertAuth: true
+ dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/p12.pass
+ dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.p12
dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+ dmaap.dmaapConsumerConfiguration.consumerGroup:
+ get_input: consumer_group
+ dmaap.dmaapConsumerConfiguration.consumerId:
+ get_input: consumer_id
+ dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+ sftp.security.strictHostKeyChecking: true
streams_subscribes:
dmaap_subscriber:
+ type: message_router
dmaap_info:
- topic_url: { concat: ['https://message-router:3905/events/',{ get_input: topic_name }, '/', { get_input: consumer_group }, "/", { get_input: consumer_id }] }
+ topic_url: { concat: ['https://message-router:3905/events/',{ get_input: topic_name }] }
docker_config:
healthcheck:
interval: 15s