summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerzySzachniewicz <jerzy.szachniewicz@nokia.com>2020-11-18 12:28:33 +0100
committerJerzySzachniewicz <jerzy.szachniewicz@nokia.com>2020-12-03 11:20:30 +0100
commit2a3e5462eef7a91fb11d76c581e689377d0ff7e5 (patch)
tree5b32f3a1042044e1ca66ce13ae75432cc1f439e2
parent7adb29c45f434cda38f1f73177e33623ccd4dd25 (diff)
Change DFC blueprint
Change certificate paths in DFC blueprint Issue-ID: DCAEGEN2-2456 Signed-off-by: JerzySzachniewicz <jerzy.szachniewicz@nokia.com> Change-Id: Id3126962044cf0e1727cdccddab2e1c84114d352 Signed-off-by: JerzySzachniewicz <jerzy.szachniewicz@nokia.com>
-rw-r--r--blueprints/k8s-datafile.yaml10
-rw-r--r--pom.xml2
-rw-r--r--version.properties2
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:
diff --git a/pom.xml b/pom.xml
index 60273f0..a523193 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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