summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changelog.md1
-rw-r--r--blueprints/k8s-datafile.yaml21
-rw-r--r--blueprints/k8s-kpi-ms.yaml3
-rw-r--r--blueprints/k8s-pm-mapper.yaml4
4 files changed, 25 insertions, 4 deletions
diff --git a/Changelog.md b/Changelog.md
index 0fef6b8..9fee6b6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [3.2.0] - 2021-06-04
- [DCAEGEN2-2617](https://jira.onap.org/browse/DCAEGEN2-2617) - Remove DCAE service component deployment from bootstrap container
+ - [DCAEGEN2-2750](https://jira.onap.org/browse/DCAEGEN2-2750) - Update Dmaap plugin version to >=1.5.1,<2.0.0
## [3.1.0] - 2021-04-16
- [DCAEGEN2-2420](https://jira.onap.org/browse/DCAEGEN2-2420) - PRH 1.6.0, PM-Mapper 1.6.0 and TCA-Gen2 1.3.0 integration base image alignemnt
diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml
index 236a20c..c79faed 100644
--- a/blueprints/k8s-datafile.yaml
+++ b/blueprints/k8s-datafile.yaml
@@ -1,3 +1,22 @@
+#
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021 Nokia
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
#description: Docker application to collect log file from PNF
#blueprint_version: 1.0.0
@@ -7,7 +26,7 @@ description: Docker application to collect log file from PNF
imports:
- http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- plugin:k8splugin?version=>=3.4.3,<4.0.0
-- plugin:dmaap?version=1.5.0
+- plugin:dmaap?version=>=1.5.1,<2.0.0
inputs:
PM_MEAS_FILES_feed0_location:
type: string
diff --git a/blueprints/k8s-kpi-ms.yaml b/blueprints/k8s-kpi-ms.yaml
index 7a2590e..d594b26 100644
--- a/blueprints/k8s-kpi-ms.yaml
+++ b/blueprints/k8s-kpi-ms.yaml
@@ -2,6 +2,7 @@
#
#============LICENSE_START=======================================================
#Copyright (C) 2021 China Mobile.
+ #Copyright (C) 2021 Nokia
#==============================================================================
#Licensed under the Apache License, Version 2.0 (the "License");
#you may not use this file except in compliance with the License.
@@ -18,7 +19,7 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
- 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml'
- - plugin:dmaap?version=1.5.0
+ - plugin:dmaap?version=>=1.5.1,<2.0.0
- plugin:k8splugin?version=>=3.4.3,<4.0.0
inputs:
replicas:
diff --git a/blueprints/k8s-pm-mapper.yaml b/blueprints/k8s-pm-mapper.yaml
index b06d4d9..6858044 100644
--- a/blueprints/k8s-pm-mapper.yaml
+++ b/blueprints/k8s-pm-mapper.yaml
@@ -1,7 +1,7 @@
#
# ============LICENSE_START=======================================================
# Copyright (C) 2019-2020 Nordix Foundation.
-# Copyright (C) 2020 Nokia
+# Copyright (C) 2020-2021 Nokia
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml'
- plugin:k8splugin?version=>=3.4.3,<4.0.0
- - plugin:dmaap?version=1.5.0
+ - plugin:dmaap?version=>=1.5.1,<2.0.0
inputs:
filter: