Merge "Fix ports and attributes"
diff --git a/blueprints/k8s-hv-ves.yaml-template b/blueprints/k8s-hv-ves.yaml-template
new file mode 100644
index 0000000..8ebb7d7
--- /dev/null
+++ b/blueprints/k8s-hv-ves.yaml-template
@@ -0,0 +1,50 @@
+# -*- indent-tabs-mode: nil -*- # vi: set expandtab:
+#
+# ============LICENSE_START====================================================
+# =============================================================================
+# Copyright (C) 2018 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.
+# ============LICENSE_END======================================================
+
+tosca_definitions_version: cloudify_dsl_1_3
+
+imports:
+ - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"
+ - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.2/k8splugin_types.yaml
+
+inputs:
+ tag_version:
+ type: string
+ default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest"
+ replicas:
+ type: integer
+ description: number of instances
+ default: 1
+node_templates:
+ hv-ves:
+ properties:
+ docker_config:
+ healthcheck:
+ endpoint: /health/ready
+ interval: 15s
+ timeout: 1s
+ type: http
+ image:
+ get_input: tag_version
+ replicas: {get_input: replicas}
+ name: 'dcae-hv-ves-collector'
+ dns_name: 'dcae-hv-ves-collector'
+ log_info:
+ log_directory: "/opt/app/HvVesCollector/logs"
+ type: dcae.nodes.ContainerizedPlatformComponent
diff --git a/blueprints/k8s-policy_handler.yaml-template b/blueprints/k8s-policy_handler.yaml-template
index e1e0db2..b654008 100644
--- a/blueprints/k8s-policy_handler.yaml-template
+++ b/blueprints/k8s-policy_handler.yaml-template
@@ -32,7 +32,7 @@
policy_handler_image:
description: Docker image for policy_handler
- default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.1.0'
+ default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.2.0'
application_config:
description: policy handler application configuration - requires info on policy-engine
diff --git a/blueprints/policy_handler.yaml-template b/blueprints/policy_handler.yaml-template
index 35041ca..b897958 100644
--- a/blueprints/policy_handler.yaml-template
+++ b/blueprints/policy_handler.yaml-template
@@ -39,7 +39,7 @@
policy_handler_image:
description: Docker image for policy_handler
- default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.1.0'
+ default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.2.0'
application_config:
description: policy handler application configuration - requires info on policy-engine
diff --git a/input-templates/phinputs.yaml b/input-templates/phinputs.yaml
index d3608c6..e23d051 100644
--- a/input-templates/phinputs.yaml
+++ b/input-templates/phinputs.yaml
@@ -34,6 +34,12 @@
# example: 1200 is 20*60 seconds that is 20 minutes
interval : 1200
+ # config of periodic reconfigure-rediscover for adaptability
+ reconfigure:
+ # interval in seconds on how often to call automatic reconfigure
+ # example: 600 is 10*60 seconds that is 10 minutes
+ interval : 600
+
# policy-engine config
# These are the url of and the auth for the external system, namely the policy-engine (PDP).
# We obtain that info manually from PDP folks at the moment.
diff --git a/pom.xml b/pom.xml
index 374da37..c0caee5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,13 +18,12 @@
ECOMP is a trademark and service mark of AT&T Intellectual Property.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>0.1.1</version>
+ <version>1.2.0</version>
</parent>
<groupId>org.onap.dcaegen2.platform</groupId>
<artifactId>blueprints</artifactId>