commit 458714cc6d7d9e79506fc6484be7f6183a129405
author Pawel Slowikowski <p.slowikows2@samsung.com> Tue Aug 31 08:31:30 2021 +0000
committer Gerrit Code Review <gerrit@onap.org> Tue Aug 31 08:31:30 2021 +0000
tree f3e398bcfd63a88260997b395aca0ac3cd2d7265
parent 2d26d2ac6ffcffea840e1b756659c4b75d9289e9
parent b9f6ba9a2501055c8ff4bc4497fc0b5d02d0ac32

Merge "Update rapps blueprints"

operations/dcae/blueprints/k8s-datacollector.yaml

diff --git a/operations/dcae/blueprints/k8s-datacollector.yaml b/operations/dcae/blueprints/k8s-datacollector.yaml
index 7cc28a4..d092936 100644
--- a/operations/dcae/blueprints/k8s-datacollector.yaml
+++ b/operations/dcae/blueprints/k8s-datacollector.yaml
@@ -19,7 +19,7 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - plugin:k8splugin?version=3.4.2
+  - plugin:k8splugin?version=>=3.4.3,<4.0.0
 inputs:
   service_id:
     type: string
@@ -28,7 +28,7 @@
   image:
     type: string
     description: docker image name and version
-    default: "nexus3.onap.org:10001/onap/datacollector/datacollector:0.0.1-SNAPSHOT"
+    default: "nexus3.onap.org:10001/onap/integration/usecase/a1-policy-enforcement/datacollector"
   database_host:
     type: string
     description: Database host.
@@ -46,9 +46,9 @@
     type: string
     description: DMaaP host.
     default: "message-router"
-  ves_measurements_topic_name:
+  ves_measurements_topics_name:
     type: string
-    default: "unauthenticated.VES_MEASUREMENT_OUTPUT"
+    default: "events/unauthenticated.VES_MEASUREMENT_OUTPUT/mygroup/mycus, events/org.onap.dmaap.mr.PERFORMANCE_MEASUREMENTS/mygroup/mycus"
 
 
 node_templates:
@@ -62,8 +62,7 @@
               DMAAP_HOST: { get_input: dmaap_host }
               DMAAP_PORT: "3904"
               DMAAP_PROTOCOL: "http"
-              # "events/unauthenticated.VES_MEASUREMENT_OUTPUT/mygroup/mycus"
-              DMAAP_MEASUREMENTS_TOPIC: {concat: ["events/", { get_input: ves_measurements_topic_name }, "/mygroup/mycus"]}
+              DMAAP_MEASUREMENTS_TOPICS: { get_input: ves_measurements_topics_name }
               DATABASE_HOST: { get_input: database_host }
               DATABASE_PORT: "3306"
               DATABASE_NAME: "ves"

operations/dcae/blueprints/k8s-sleepingcelldetector.yaml

diff --git a/operations/dcae/blueprints/k8s-sleepingcelldetector.yaml b/operations/dcae/blueprints/k8s-sleepingcelldetector.yaml
index e06b508..fe087fa 100644
--- a/operations/dcae/blueprints/k8s-sleepingcelldetector.yaml
+++ b/operations/dcae/blueprints/k8s-sleepingcelldetector.yaml
@@ -19,7 +19,7 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - plugin:k8splugin?version=3.4.2
+  - plugin:k8splugin?version=>=3.4.3,<4.0.0
 inputs:
   service_id:
     type: string
@@ -28,7 +28,7 @@
   image:
     type: string
     description: docker image name and version
-    default: "nexus3.onap.org:10001/onap/sleepingcelldetector/sleepingcelldetector:0.0.1-SNAPSHOT"
+    default: "nexus3.onap.org:10001/onap/integration/usecase/a1-policy-enforcement/sleepingcelldetector"
 
 node_templates:
   rapp-sleepingcelldetector: