update dcae service bp

Change-Id: Iad8413a6babdbd753a993abaa69fc2f38cf074ce
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-772

diff --git a/blueprints/k8s-config_binding_service.yaml-template b/blueprints/k8s-config_binding_service.yaml-template
index 52cb457..1d52552 100644 (file)
--- a/blueprints/k8s-config_binding_service.yaml-template
+++ b/blueprints/k8s-config_binding_service.yaml-template
@@ -30,7 +30,7 @@ inputs:
 
   cbs_image:
     description: Docker image for config binding service
-    default: {{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.configbinding:2.1.5
+    default: {{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.3
   replicas:
     description: Number of instances to launch
     type: integer

diff --git a/blueprints/k8s-holmes-engine.yaml-template b/blueprints/k8s-holmes-engine.yaml-template
index 0c4eacf..ebf0df1 100644 (file)
--- a/blueprints/k8s-holmes-engine.yaml-template
+++ b/blueprints/k8s-holmes-engine.yaml-template
@@ -70,6 +70,8 @@ node_templates:
                 { get_attribute: [ pgaasvm, admin, user ] }
             MSB_ADDR:
                 get_input: msb_hostname
+           ports:
+             - '9102:0'
     properties:
       name: 'holmes-engine-mgmt'
       dns_name: 'holmes-engine-mgmt'
@@ -96,8 +98,6 @@ node_templates:
           interval: 15s
           timeout: 1s
           type: http
-        ports:
-        - 9102:0
       image: { get_input: he_image }
       # need to use truncated name!!
       #service_component_type: dcae-analytics-holmes-engin-management

diff --git a/blueprints/k8s-holmes-rules.yaml-template b/blueprints/k8s-holmes-rules.yaml-template
index 9662a43..e1ded8a 100644 (file)
--- a/blueprints/k8s-holmes-rules.yaml-template
+++ b/blueprints/k8s-holmes-rules.yaml-template
@@ -59,6 +59,9 @@ node_templates:
                 { get_attribute: [ pgaasvm, admin, user ] }
             MSB_ADDR:
                 get_input: msb_hostname
+           ports:
+             - '9101:0'
+             - '9104:0'
     properties:
       name: 'holmes-rule-mgmt'
       dns_name: 'holmes-rule-mgmt'
@@ -76,8 +79,6 @@ node_templates:
           interval: 15s
           timeout: 1s
           type: http
-        ports:
-        - 9101:0
       image: { get_input: hr_image }
       #service_component_type: dcae-analytics-holmes-rule-management
     relationships:

diff --git a/blueprints/k8s-prh.yaml-template b/blueprints/k8s-prh.yaml-template
index a86baeb..17bea87 100644 (file)
--- a/blueprints/k8s-prh.yaml-template
+++ b/blueprints/k8s-prh.yaml-template
@@ -56,7 +56,7 @@ inputs:
     default: "admin"
   tag_version:
     type: string
-    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest"
+    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.0.0"
   replicas:
     type: integer
     description: number of instances

diff --git a/blueprints/k8s-snmptrap.yaml-template b/blueprints/k8s-snmptrap.yaml-template
new file mode 100644 (file)
index 0000000..9649237
--- /dev/null
+++ b/blueprints/k8s-snmptrap.yaml-template
@@ -0,0 +1,124 @@
+# -*- indent-tabs-mode: nil -*- # vi: set expandtab:
+#
+# ============LICENSE_START====================================================
+# =============================================================================
+# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+# =============================================================================
+# 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.3/k8splugin_types.yaml
+inputs:
+  tag_version:
+    type: string
+    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0"
+  cache:
+    type: string
+    default:
+      dns_cache_ttl_seconds: '60'
+  files:
+    type: string
+    default:
+    - arriving_traps_log: snmptrapd_arriving_traps.log
+      data_dir: data
+      eelf_audit: audit.log
+      eelf_base_dir: /opt/app/snmptrap/logs
+      eelf_debug: debug.log
+      eelf_error: error.log
+      eelf_metrics: metrics.log
+      log_dir: logs
+      minimum_severity_to_log: '2'
+      perm_status_file: snmptrapd_status.log
+      pid_dir: tmp
+      roll_frequency: day
+      runtime_base_dir: /opt/app/snmptrap
+      snmptrapd_diag: snmptrapd_prog_diag.log
+      traps_stats_log: snmptrapd_stats.csv
+  protocols:
+    type: string
+    default:
+    - ipv4_interface: 0.0.0.0
+      ipv4_port: '6162'
+      ipv6_interface: ::1
+      ipv6_port: '6162'
+  publisher:
+    type: string
+    default:
+    - http_milliseconds_between_retries: '750'
+      http_milliseconds_timeout: '1500'
+      http_peer_publisher: unavailable
+      http_primary_publisher: 'true'
+      http_retries: '3'
+      max_milliseconds_between_publishes: '10000'
+      max_traps_between_publishes: '10'
+  sec_fault_unsecure_topic:
+    type: string
+    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.ONAP-COLLECTOR-SNMPTRAP"
+  snmptrapd:
+    type: string
+    default:
+    - title: Collector for receiving SNMP traps and publishing to DMAAP/MR
+      version: 1.4.0
+  replicas:
+    type: integer
+    description: number of instances
+    default: 1
+
+node_templates:
+  snmptrap:
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        start:
+          inputs:
+           ports:
+             - '6162:0'
+    properties:
+      application_config:
+        StormWatchPolicy: ''
+        cache:
+          get_input: cache
+        files:
+          get_input: files
+        protocols:
+          get_input: protocols
+        publisher:
+          get_input: publisher
+        services_calls: {}
+        snmptrapd:
+          get_input: snmptrapd
+        sw_interval_in_seconds: '60'
+        streams_publishes:
+            ves-fault:
+              dmaap_info:
+                topic_url:
+                  get_input: sec_fault_unsecure_topic
+              type: message_router
+      docker_config:
+        healthcheck:
+          interval: 300s
+          script: /opt/app/snmptrap/bin/snmptrapd.sh status
+          timeout: 120s
+          type: docker
+        ports:
+        - 6162/udp:162
+      image:
+        get_input: tag_version
+      replicas: {get_input: replicas}
+      name: 'dcae-snmptrap-collector'
+      dns_name: 'dcae-snmptrap-collector'
+    type: dcae.nodes.ContainerizedPlatformComponent
+