aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork.kedron <k.kedron@partner.samsung.com>2021-08-18 14:23:29 +0200
committerk.kedron <k.kedron@partner.samsung.com>2021-08-23 10:16:45 +0200
commitb9f6ba9a2501055c8ff4bc4497fc0b5d02d0ac32 (patch)
treeea94fee8f29b29fc36ff565d19723f96ed6590f0
parent7353dfdf4d4a775cd2dfdf79b449112b75469987 (diff)
Update rapps blueprints
To support honolulu New datacollector code Issue-ID: INT-1945 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: Iba0b9b91f70ca77f4a4d8d9520898bc332950832
-rw-r--r--operations/dcae/blueprints/k8s-datacollector.yaml11
-rw-r--r--operations/dcae/blueprints/k8s-sleepingcelldetector.yaml4
2 files changed, 7 insertions, 8 deletions
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 @@ inputs:
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 @@ inputs:
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 @@ node_templates:
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"
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 @@ inputs:
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: