diff options
| author |   Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2020-12-04 09:07:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-12-04 09:07:13 +0000 |
| commit | 777144919d3017d0c9e783def43283a4bab33d17 (patch) | |
| tree | 2677fcd13c17df83e62b4438dfc2a98aafdaa816 | |
| parent | 0d14304ebc5764aa77009b2c3d1e0e205dd816d6 (diff) | |
| parent | 2a3e5462eef7a91fb11d76c581e689377d0ff7e5 (diff) | |
Merge "Change DFC blueprint"
| -rw-r--r-- | blueprints/k8s-datafile.yaml | 10 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml index a43e378..cc5b127 100644 --- a/blueprints/k8s-datafile.yaml +++ b/blueprints/k8s-datafile.yaml @@ -73,13 +73,13 @@ node_templates: PM_MEAS_FILES: dmaap_info: <<feed0>> type: data_router - 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.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.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.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass + dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks dmaap.dmaapConsumerConfiguration.consumerGroup: @@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <groupId>org.onap.dcaegen2.deployments</groupId> <artifactId>k8s-bootstrap-container</artifactId> <name>dcaegen2-deployments-k8s-bootstrap-container</name> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.2-SNAPSHOT</version> <url>http://maven.apache.org</url> <packaging>pom</packaging> diff --git a/version.properties b/version.properties index a234eb1..3d83508 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=2
minor=2
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT
|