R5 tag update

[dcaegen2/platform/blueprints.git] / blueprints / k8s-ves.yaml-template

diff --git a/blueprints/k8s-ves.yaml-template b/blueprints/k8s-ves.yaml-template
index 6a80272..3cf8d35 100644 (file)
--- a/blueprints/k8s-ves.yaml-template
+++ b/blueprints/k8s-ves.yaml-template
@@ -2,7 +2,7 @@
 #
 # ============LICENSE_START====================================================
 # =============================================================================
-# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2019 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.
@@ -21,7 +21,7 @@ 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.1/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml
 
 inputs:
   ves_other_publish_url:
@@ -49,10 +49,14 @@ inputs:
     type: string
     description: Kubernetes node port on which collector is exposed
     default: "30235"
+  external_tls_port:
+    type: string
+    description: Kubernetes node port on which collector is exposed for https
+    default: "30417"
   replicas:
     type: integer
     description: number of instances
-    default: 1   
+    default: 1
 node_templates:
   ves:
     interfaces:
@@ -60,7 +64,8 @@ node_templates:
         start:
           inputs:
            ports:
-             - concat: ["8080:", { get_input: external_port }]             
+             - concat: ["8080:", { get_input: external_port }]
+             - concat: ["8443:", { get_input: external_tls_port }]
     properties:
       application_config:
         collector.dmaap.streamid: fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration
@@ -69,12 +74,12 @@ node_templates:
         collector.keystore.file.location: /opt/app/VESCollector/etc/keystore
         collector.keystore.passwordfile: /opt/app/VESCollector/etc/passwordfile
         collector.schema.checkflag: "1"
-        collector.schema.file: "{\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.json\",\"v7\":\"./etc/CommonEventFormat_30.0.1.json\"}"
+        collector.schema.file: "{\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.1.json\",\"v7\":\"./etc/CommonEventFormat_30.0.1.json\"}"
         collector.service.port: "8080"
         collector.service.secure.port: "8443"
         event.transform.flag: "0"
         header.authflag: "0"
-        header.authlist: "userid1,base64encodepwd1|userid2,base64encodepwd2"
+        header.authlist: "sample1,c2FtcGxlMQ=="
         services_calls: []
         streams_publishes:
             ves-fault:
@@ -122,5 +127,5 @@ node_templates:
       log_info:
         log_directory: "/opt/app/VESCollector/logs/ecomp"
     type: dcae.nodes.ContainerizedPlatformComponent
-    
+