diff options
| author |   ecaiyanlinux <martin.c.yan@est.tech> | 2019-09-06 15:24:59 +0000 |
|---|---|---|
| committer | ecaiyanlinux <martin.c.yan@est.tech> | 2019-09-06 15:24:59 +0000 |
| commit | 6c925362213b8f05612b309fb50fa4c0b5650224 (patch) | |
| tree | 50b91263d7d457721627b87e7ac6e8f9a81c740d /datafile-app-server/dpo/tosca_models | |
| parent | e92d9f47629e635ae70c856615556476d266cb3f (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/tosca_models')
| -rw-r--r-- | datafile-app-server/dpo/tosca_models/schema.yaml | 4 | ||||
| -rw-r--r-- | datafile-app-server/dpo/tosca_models/template.yaml | 14 | ||||
| -rw-r--r-- | datafile-app-server/dpo/tosca_models/translate.yaml | 4 |
3 files changed, 11 insertions, 11 deletions
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 |