[DCAEGEN2]Release dcaegen2-services-pm-mapper container

[dcaegen2/services/pm-mapper.git] / dpo / blueprints / k8s-pm-mapper.yaml

diff --git a/dpo/blueprints/k8s-pm-mapper.yaml b/dpo/blueprints/k8s-pm-mapper.yaml
index 9da07c1..5662e1d 100644 (file)
--- a/dpo/blueprints/k8s-pm-mapper.yaml
+++ b/dpo/blueprints/k8s-pm-mapper.yaml
@@ -1,6 +1,6 @@
 #
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2019 Nordix Foundation.
+#  Copyright (C) 2019-2020 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -21,15 +21,15 @@
 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/R5/k8splugin/1.6.0/k8splugin_types.yaml'
+  - 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml'
+  - 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml'
   - 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml'
 
 inputs:
   filter:
     type: string
     description: PM Mapper filter on measInfo, measInfoId, measType, instanceId
-    default: '{ "filters":[]}'
+    default: "{ \"filters\":[] }"
   enable_http:
     type: boolean
     description: Option to turn on HTTP connections
@@ -99,12 +99,25 @@ inputs:
     type: string
     description: DMAAP Message Router host port
     default: '3905'
+  cpu_limit:
+    type: string
+    default: '1000m'
+  cpu_request:
+    type: string
+    default: '1000m'
+  memory_limit:
+    type: string
+    default: '1024Mi'
+  memory_request:
+    type: string
+    default: '1024Mi'
 
 node_templates:
   pm-feed:
     type: ccsdk.nodes.Feed
     properties:
       feed_name: { get_input: feed_name }
+      useExisting: true
 
   pm-topic:
     type: ccsdk.nodes.Topic
@@ -131,9 +144,9 @@ node_templates:
       service_component_type: 'dcae-pm-mapper'
       service_component_name_override: 'dcae-pm-mapper'
       application_config:
-        trust_store_path: '/opt/app/pm-mapper/etc/cert/trust.jks.b64'
+        trust_store_path: '/opt/app/pm-mapper/etc/cert/trust.jks'
         trust_store_pass_path: '/opt/app/pm-mapper/etc/cert/trust.pass'
-        key_store_path: '/opt/app/pm-mapper/etc/cert/cert.jks.b64'
+        key_store_path: '/opt/app/pm-mapper/etc/cert/cert.jks'
         key_store_pass_path: '/opt/app/pm-mapper/etc/cert/jks.pass'
         pm-mapper-filter: { get_input: filter }
         enable_http: { get_input: enable_http }
@@ -148,6 +161,13 @@ node_templates:
           dmaap_publisher:
             type: message_router
             dmaap_info: <<pm-topic>>
+      resource_config:
+        limits:
+          cpu: { get_input: cpu_limit }
+          memory: { get_input: memory_limit }
+        requests:
+          cpu: { get_input: cpu_request }
+          memory: { get_input: memory_request }
       docker_config:
         healthcheck:
           endpoint: /healthcheck