summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--blueprints/DeploymentHandler.yaml-template2
-rw-r--r--blueprints/k8s-datafile-collector.yaml-template2
-rw-r--r--blueprints/k8s-deployment_handler.yaml-template2
-rw-r--r--blueprints/k8s-hv-ves.yaml-template31
-rw-r--r--blueprints/k8s-policy_handler.yaml-template2
-rw-r--r--blueprints/k8s-prh.yaml-template14
-rw-r--r--blueprints/policy_handler.yaml-template2
-rw-r--r--input-templates/phinputs.yaml6
8 files changed, 38 insertions, 23 deletions
diff --git a/blueprints/DeploymentHandler.yaml-template b/blueprints/DeploymentHandler.yaml-template
index afdb377..7775e3b 100644
--- a/blueprints/DeploymentHandler.yaml-template
+++ b/blueprints/DeploymentHandler.yaml-template
@@ -44,7 +44,7 @@ inputs:
deployment_handler_image:
description: Docker image for deployment handler
- default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.deployment-handler:3.0.3'
+ default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.deployment-handler:3.1.0'
application_config:
description: deployment handler application configuration (to override defaults)
diff --git a/blueprints/k8s-datafile-collector.yaml-template b/blueprints/k8s-datafile-collector.yaml-template
index e9c2578..62b908f 100644
--- a/blueprints/k8s-datafile-collector.yaml-template
+++ b/blueprints/k8s-datafile-collector.yaml-template
@@ -58,7 +58,7 @@ inputs:
default: "dradmin"
tag_version:
type: string
- default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.1.0"
+ default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.1.1"
replicas:
type: integer
description: number of instances
diff --git a/blueprints/k8s-deployment_handler.yaml-template b/blueprints/k8s-deployment_handler.yaml-template
index d66f5d2..2fd1c29 100644
--- a/blueprints/k8s-deployment_handler.yaml-template
+++ b/blueprints/k8s-deployment_handler.yaml-template
@@ -31,7 +31,7 @@ inputs:
deployment_handler_image:
description: Docker image for deployment handler
- default: {{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.deployment-handler:3.0.3
+ default: {{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.deployment-handler:3.1.0
application_config:
description: deployment handler application configuration (to override defaults)
default: {}
diff --git a/blueprints/k8s-hv-ves.yaml-template b/blueprints/k8s-hv-ves.yaml-template
index fffafff..acdbb59 100644
--- a/blueprints/k8s-hv-ves.yaml-template
+++ b/blueprints/k8s-hv-ves.yaml-template
@@ -2,7 +2,7 @@
#
# ============LICENSE_START====================================================
# =============================================================================
-# Copyright (C) 2018 NOKIA
+# Copyright (C) 2018-2019 NOKIA
# =============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -59,6 +59,10 @@ inputs:
perf3gpp_kafka_topic:
type: string
default: 'HV_VES_PERF3GPP'
+ healthcheck_port:
+ type: integer
+ description: Network port that the HV-Ves HTTP service for performing healthcheck is running
+ default: 6060
node_templates:
hv-ves:
interfaces:
@@ -66,30 +70,33 @@ node_templates:
start:
inputs:
envs:
+ JAVA_OPTS: '-Dlogback.configurationFile=/etc/ONAP/dcae-hv-ves-collector/logback.xml'
VESHV_CONFIG_URL:
- { concat: [ 'http://', { get_input: consul_host }, ':', { get_input: consul_port }, '/v1/kv/', { get_input: hv_ves_name} ] }
+ { concat: [ 'http://', { get_input: consul_host }, ':', { get_input: consul_port }, '/v1/kv/', { get_input: hv_ves_name}, '?raw=true' ] }
VESHV_LISTEN_PORT:
{ concat: [ { get_input: container_port }, '' ] }
+ VESHV_HEALTH_CHECK_API_PORT:
+ { concat: [ { get_input: healthcheck_port }, '' ] }
+ VESHV_KAFKA_BOOTSTRAP_SERVERS:
+ { get_input: kafka_bootstrap_servers }
VESHV_SSL_DISABLE: ''
properties:
application_config:
- dmaap.kafkaBootstrapServers: { get_input: kafka_bootstrap_servers }
collector.routing:
- fromDomain: { get_input: perf3gpp_domain }
toTopic: { get_input: perf3gpp_kafka_topic }
-# TODO: https://jira.onap.org/browse/DCAEGEN2-794
-# docker_config:
-# healthcheck:
-# endpoint: /health/ready
-# interval: 15s
-# timeout: 1s
-# type: http
+ docker_config:
+ healthcheck:
+ type: script
+ script: "/opt/ves-hv-collector/healthcheck.sh"
+ interval: 15s
+ timeout: 2s
image: { get_input: tag_version }
replicas: { get_input: replicas }
name: { get_input: hv_ves_name }
- dns_name: 'dcae-hv-ves-collector'
+ dns_name: { get_input: hv_ves_name }
container_port: { get_input: container_port }
host_port: { get_input: host_port }
log_info:
- log_directory: '/opt/app/HvVesCollector/logs'
+ log_directory: '/var/log/ONAP/dcae-hv-ves-collector'
type: dcae.nodes.ContainerizedPlatformComponent
diff --git a/blueprints/k8s-policy_handler.yaml-template b/blueprints/k8s-policy_handler.yaml-template
index b6c5f9e..0e37734 100644
--- a/blueprints/k8s-policy_handler.yaml-template
+++ b/blueprints/k8s-policy_handler.yaml-template
@@ -32,7 +32,7 @@ inputs:
policy_handler_image:
description: Docker image for policy_handler
- default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.4.0'
+ default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.5.0'
application_config:
description: policy handler application configuration - requires info on policy-engine
diff --git a/blueprints/k8s-prh.yaml-template b/blueprints/k8s-prh.yaml-template
index 198ece3..c6f1652 100644
--- a/blueprints/k8s-prh.yaml-template
+++ b/blueprints/k8s-prh.yaml-template
@@ -98,11 +98,10 @@ node_templates:
aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors: true
aai.aaiClientConfiguration.aaiBasePath: "/aai/v12"
aai.aaiClientConfiguration.aaiPnfPath: "/network/pnfs/pnf"
- secure.configuration.keyFile: "/opt/app/prh/local/org.onap.prh.keyfile"
- secure.configuration.trustStore: "/opt/app/prh/local/org.onap.prh.trust.jks"
- secure.configuration.trustStorePassword: "change it"
- secure.configuration.keyStore: "/opt/app/prh/local/org.onap.prh.p12"
- secure.configuration.keyStorePassword: "change it"
+ secure.configuration.trustStore: "/opt/app/prh/etc/cert/trust.jks"
+ secure.configuration.trustStorePasswordPath: "/opt/app/prh/etc/cert/trust.pass"
+ secure.configuration.keyStore: "/opt/app/prh/etc/cert/key.p12"
+ secure.configuration.keyStorePasswordPath: "/opt/app/prh/etc/cert/key.pass"
secure.configuration.enableAaiCertAuth: { get_input: secureEnableCert }
secure.configuration.enableDmaapCertAuth: { get_input: secureEnableCert }
host_port:
@@ -116,10 +115,13 @@ node_templates:
timeout: 1s
type: http
image:
- get_input: { get_input: tag_version }
+ { get_input: tag_version }
replicas: {get_input: replicas}
name: 'dcae-prh'
dns_name: 'dcae-prh'
log_info:
log_directory: "/opt/app/prh/logs"
+ tls_info:
+ cert_directory: '/opt/app/prh/etc/cert/'
+ use_tls: true
type: dcae.nodes.ContainerizedPlatformComponent
diff --git a/blueprints/policy_handler.yaml-template b/blueprints/policy_handler.yaml-template
index 48302c4..c9d09b3 100644
--- a/blueprints/policy_handler.yaml-template
+++ b/blueprints/policy_handler.yaml-template
@@ -39,7 +39,7 @@ inputs:
policy_handler_image:
description: Docker image for policy_handler
- default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.4.0'
+ default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:4.5.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 50b90b2..89a3de5 100644
--- a/input-templates/phinputs.yaml
+++ b/input-templates/phinputs.yaml
@@ -68,6 +68,10 @@ application_config:
tls_ca_mode : "cert_directory"
# optional tls_wss_ca_mode specifies the same for the tls based web-socket
tls_wss_ca_mode : "cert_directory"
+ # optional timeout_in_secs specifies the timeout for the http requests
+ timeout_in_secs: 60
+ # optional ws_ping_interval_in_secs specifies the ping interval for the web-socket connection
+ ws_ping_interval_in_secs: 180
# deploy_handler config
# changed from string "deployment_handler" in 2.3.1 to structure in 2.4.0
deploy_handler :
@@ -93,3 +97,5 @@ application_config:
#
# "do_not_verify" - special hack to turn off the verification by cacert and hostname
tls_ca_mode : "cert_directory"
+ # optional timeout_in_secs specifies the timeout for the http requests
+ timeout_in_secs: 60