summaryrefslogtreecommitdiffstats
path: root/datafile-app-server/dpo
diff options
context:
space:
mode:
authorecaiyanlinux <martin.c.yan@est.tech>2019-09-06 15:24:59 +0000
committerecaiyanlinux <martin.c.yan@est.tech>2019-09-06 15:24:59 +0000
commit6c925362213b8f05612b309fb50fa4c0b5650224 (patch)
tree50b91263d7d457721627b87e7ac6e8f9a81c740d /datafile-app-server/dpo
parente92d9f47629e635ae70c856615556476d266cb3f (diff)
TLS init container usage
Change-Id: Iec51c722f6a3a519fd7eb0f37f8b801eebbc039b Issue-ID: DCAEGEN2-1702 Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
Diffstat (limited to 'datafile-app-server/dpo')
-rw-r--r--datafile-app-server/dpo/blueprints/k8s-datafile.yaml8
-rw-r--r--datafile-app-server/dpo/spec/datafile-component-spec.json14
-rw-r--r--datafile-app-server/dpo/tosca_models/schema.yaml4
-rw-r--r--datafile-app-server/dpo/tosca_models/template.yaml14
-rw-r--r--datafile-app-server/dpo/tosca_models/translate.yaml4
5 files changed, 22 insertions, 22 deletions
diff --git a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
index 8b782808..cf85500f 100644
--- a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
+++ b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
@@ -65,10 +65,10 @@ node_templates:
dmaap_info: <<feed0>>
type: data_router
streams_subscribes: {}
- 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.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
diff --git a/datafile-app-server/dpo/spec/datafile-component-spec.json b/datafile-app-server/dpo/spec/datafile-component-spec.json
index 9dafbfd3..6047a7c0 100644
--- a/datafile-app-server/dpo/spec/datafile-component-spec.json
+++ b/datafile-app-server/dpo/spec/datafile-component-spec.json
@@ -62,8 +62,8 @@
"required": true
},
{
- "name": "dmaap.ftpesConfig.keyPassword",
- "value": "secret",
+ "name": "dmaap.ftpesConfig.keyPasswordPath",
+ "value": "/opt/app/datafile/etc/cert/jks.pass",
"description": "",
"designer_editable": true,
"sourced_at_deployment": false,
@@ -73,7 +73,7 @@
},
{
"name": "dmaap.ftpesConfig.trustedCa",
- "value": "/opt/app/datafile/config/ftp.jks",
+ "value": "/opt/app/datafile/config/cert.jks",
"description": "",
"designer_editable": true,
"sourced_at_deployment": false,
@@ -82,8 +82,8 @@
"required": true
},
{
- "name": "dmaap.ftpesConfig.trustedCaPassword",
- "value": "secret",
+ "name": "dmaap.ftpesConfig.trustedCaPasswordPath",
+ "value": "/opt/app/datafile/etc/cert/trust.pass",
"description": "",
"designer_editable": true,
"sourced_at_deployment": false,
@@ -113,7 +113,7 @@
},
{
"name": "dmaap.security.keyStorePath",
- "value": "/opt/app/datafile/etc/cert/key.p12",
+ "value": "/opt/app/datafile/etc/cert/cert.jks",
"description": "",
"designer_editable": true,
"sourced_at_deployment": false,
@@ -123,7 +123,7 @@
},
{
"name": "dmaap.security.keyStorePasswordPath",
- "value": "/opt/app/datafile/etc/cert/key.pass",
+ "value": "/opt/app/datafile/etc/cert/jks.pass",
"description": "",
"designer_editable": true,
"sourced_at_deployment": false,
diff --git a/datafile-app-server/dpo/tosca_models/schema.yaml b/datafile-app-server/dpo/tosca_models/schema.yaml
index 588e5824..474af7ac 100644
--- a/datafile-app-server/dpo/tosca_models/schema.yaml
+++ b/datafile-app-server/dpo/tosca_models/schema.yaml
@@ -508,11 +508,11 @@ node_types:
type: string
ftp.ftpesConfiguration.keyCert:
type: string
- ftp.ftpesConfiguration.keyPassword:
+ ftp.ftpesConfiguration.keyPasswordPath:
type: string
ftp.ftpesConfiguration.trustedCa:
type: string
- ftp.ftpesConfiguration.trustedCaPassword:
+ ftp.ftpesConfiguration.trustedCaPasswordPath:
type: string
security.enableDmaapCertAuth:
type: string
diff --git a/datafile-app-server/dpo/tosca_models/template.yaml b/datafile-app-server/dpo/tosca_models/template.yaml
index e1813003..a1fdadb7 100644
--- a/datafile-app-server/dpo/tosca_models/template.yaml
+++ b/datafile-app-server/dpo/tosca_models/template.yaml
@@ -17,18 +17,18 @@ topology_template:
properties:
datafile.policy: ''
dmaap.dmaapProducerConfiguration: '[{''changeIdentifier'': ''PM_MEAS_FILES'', ''feedName'': ''bulk_pm_feed''}]'
- ftp.ftpesConfiguration.keyCert: config/dfc.jks
- ftp.ftpesConfiguration.keyPassword: secret
- ftp.ftpesConfiguration.trustedCa: config/ftp.jks
- ftp.ftpesConfiguration.trustedCaPassword: secret
+ ftp.ftpesConfiguration.keyCert: /opt/app/datafile/etc/cert/cert.jks
+ ftp.ftpesConfiguration.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+ ftp.ftpesConfiguration.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+ ftp.ftpesConfiguration.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
location_id:
get_property:
- SELF
- composition
- location_id
- security.enableDmaapCertAuth: 'False'
- security.keyStorePasswordPath: /opt/app/datafile/etc/cert/key.pass
- security.keyStorePath: /opt/app/datafile/etc/cert/key.p12
+ security.enableDmaapCertAuth: 'false'
+ security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+ security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
service_name: datafile
diff --git a/datafile-app-server/dpo/tosca_models/translate.yaml b/datafile-app-server/dpo/tosca_models/translate.yaml
index 17c36aea..35036df7 100644
--- a/datafile-app-server/dpo/tosca_models/translate.yaml
+++ b/datafile-app-server/dpo/tosca_models/translate.yaml
@@ -20,11 +20,11 @@ topology_template:
type: string
ftp.ftpesConfiguration.keyCert:
type: string
- ftp.ftpesConfiguration.keyPassword:
+ ftp.ftpesConfiguration.keyPasswordPath:
type: string
ftp.ftpesConfiguration.trustedCa:
type: string
- ftp.ftpesConfiguration.trustedCaPassword:
+ ftp.ftpesConfiguration.trustedCaPasswordPath:
type: string
image:
type: string