From cde60c05bbbeff0b3e46f9cff30fe38036da1e9c Mon Sep 17 00:00:00 2001 From: Vijay Venkatesh Kumar Date: Sun, 28 Apr 2019 22:22:38 +0000 Subject: update heartbeat bps Change-Id: I13b82f469d67b5ef36b5f31574cd2b072dec08d4 Signed-off-by: Vijay Venkatesh Kumar Issue-ID: DCAEGEN2-1270 --- dpo/k8s-heartbeat-inputs.yaml | 28 ++++++++++++++-------------- dpo/k8s-heartbeat.yaml | 18 ++++++++++-------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dpo/k8s-heartbeat-inputs.yaml b/dpo/k8s-heartbeat-inputs.yaml index 7a81d9e..ec50eb8 100644 --- a/dpo/k8s-heartbeat-inputs.yaml +++ b/dpo/k8s-heartbeat-inputs.yaml @@ -1,19 +1,19 @@ -tag_version: "nexus.onap.org:10001/onap/org.onap.dcaegen2.services.heartbeat:2.1.0" -heartbeat_name: "dcae-heartbeat-service" +tag_version: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.heartbeat:2.1.0' +heartbeat_name: 'dcae-heartbeat-service' replicas: 1 host_port: 30230 container_port: 10002 -consul_host: "consul-server.onap" +consul_host: 'consul-server.onap' consul_port: 8500 -CBS_polling_allowed: "True" -CBS_polling_interval: "300" -consumerID: "1" -groupID: "groupID" -pg_ipAddress: "hbpostgres-write" -pg_passwd: "postgres" +CBS_polling_allowed: 'True' +CBS_polling_interval: '300' +consumerID: '1' +groupID: 'hbgrpID' +pg_ipAddress: 'hbpostgres-write' +pg_passwd: 'postgres' pg_dbName: postgres -pg_portNum: "5432" -pg_userName: "postgres" -ves_heartbeat_publish_url: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT" -dcae_CL_publish_url: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT" -namespace: "onap" +pg_portNum: '5432' +pg_userName: 'postgres' +ves_heartbeat_publish_url: 'http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT' +dcae_CL_publish_url: 'http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT' +namespace: 'onap' diff --git a/dpo/k8s-heartbeat.yaml b/dpo/k8s-heartbeat.yaml index 0c633e8..ed7f0da 100644 --- a/dpo/k8s-heartbeat.yaml +++ b/dpo/k8s-heartbeat.yaml @@ -18,14 +18,14 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - - 'http://www.getcloudify.org/spec/cloudify/3.4/types.yaml' - - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml + - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml + - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.13/k8splugin_types.yaml - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml inputs: tag_version: type: string - default: 'nexus.onap.org:10001/onap/org.onap.dcaegen2.services.heartbeat:2.1.0' + default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.heartbeat:2.1.0' heartbeat_name: type: string default: 'dcae-heartbeat-service' @@ -57,12 +57,13 @@ inputs: default: '300' consumerID: type: string - default: "1" + default: '1' groupID: type: string - default: groupID + default: hbgrpID namespace: type: string + default: onap pg_dbName: type: string default: hb_vnf @@ -74,16 +75,16 @@ inputs: default: pg-heartbeatpwd pg_portNum: type: string - default: "5432" + default: '5432' pg_userName: type: string default: heartbeat ves_heartbeat_publish_url: type: string - default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT" + default: 'http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT' dcae_CL_publish_url: type: string - default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT" + default: 'http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT' node_templates: hbpostgres: type: dcae.nodes.ContainerizedApplication @@ -133,6 +134,7 @@ node_templates: get_input: pg_dbName ports: - "10002:0" + properties: application_config: CBS_polling_allowed: -- cgit 1.2.3-korg