[DCAE] Adapt DCAE blueprints to CFY DCAE K8S plugin version 3.x.x -

correction

Issue-ID: DCAEGEN2-2386
Signed-off-by: Grzegorz Lis <grzegorz.lis@nokia.com>
Change-Id: I65bcf24497304b96b62a3a5eb04665acbdeca323

diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml
index ddc5666..73cf230 100644 (file)
--- a/blueprints/k8s-datafile.yaml
+++ b/blueprints/k8s-datafile.yaml
@@ -59,7 +59,7 @@ inputs:
     default: false
 node_templates:
   datafile-collector:
-    type: dcae.nodes.ContainerizedServiceComponent
+    type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
     interfaces:
       cloudify.interfaces.lifecycle:
         start:

diff --git a/blueprints/k8s-pm-mapper.yaml b/blueprints/k8s-pm-mapper.yaml
index 7e8fdb4..b65b153 100644 (file)
--- a/blueprints/k8s-pm-mapper.yaml
+++ b/blueprints/k8s-pm-mapper.yaml
@@ -127,7 +127,7 @@ node_templates:
       topic_name: { get_input: topic_name }
 
   pm-mapper:
-    type: dcae.nodes.ContainerizedServiceComponent
+    type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
     interfaces:
       cloudify.interfaces.lifecycle:
         create:

diff --git a/pom.xml b/pom.xml
index 2a86e10..b560fcd 100644 (file)
--- 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.1.1-SNAPSHOT</version>
+  <version>2.1.2-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <packaging>pom</packaging>
 

diff --git a/version.properties b/version.properties
index 607bf2c..56a8b6d 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=2\r
 minor=1\r
-patch=1\r
+patch=2\r
 base_version=${major}.${minor}.${patch}\r
 release_version=${base_version}\r
 snapshot_version=${base_version}-SNAPSHOT\r