Added template for ves

Added template (for ves secure) and update template (for ves insecure)

Issue-ID: DCAEGEN2-1777
Signed-off-by: Pawel <pawel.kasperkiewicz@nokia.com>
Change-Id: Ie435043c1ca8e17d616e93fbc16d1e8abd44efe1

diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml
index 7a45a5c..20526ff 100644 (file)
--- a/blueprints/k8s-ves.yaml
+++ b/blueprints/k8s-ves.yaml
@@ -3,6 +3,7 @@
 # ============LICENSE_START====================================================
 # =============================================================================
 # Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2020 Nokia. 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.
@@ -44,15 +45,35 @@ inputs:
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_PNFREG_OUTPUT"
   tag_version:
     type: string
-    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.5.2"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.5.2"
+  internal_port:
+    type: string
+    description: Kubernetes node port on which collector is exposed
+    default: "8080"
   external_port:
     type: string
     description: Kubernetes node port on which collector is exposed
     default: "30235"
-  external_tls_port:
+  internal_port_tls:
     type: string
-    description: Kubernetes node port on which collector is exposed for https
+    description: Kubernetes node port on which collector is exposed
+    default: "8443"
+  external_port_tls:
+    type: string
+    description: Kubernetes node port on which collector is exposed
     default: "30417"
+  auth_method:
+    type: string
+    default: "noAuth"
+  component_name:
+    type: string
+    default: "dcae-ves-collector"
+  dns_component_name:
+    type: string
+    default: "dcae-ves-collector"
+  enable_tls:
+    type: boolean
+    default: false
   replicas:
     type: integer
     description: number of instances
@@ -63,54 +84,55 @@ node_templates:
       cloudify.interfaces.lifecycle:
         start:
           inputs:
-           ports:
-             - concat: ["8080:", { get_input: external_port }]
-             - concat: ["8443:", { get_input: external_tls_port }]
+            ports:
+              - concat: [{get_input: internal_port},":",{get_input: external_port}]
+              - concat: [{get_input: internal_port_tls},":",{get_input: external_port_tls}]
     properties:
       application_config:
         collector.dmaap.streamid: fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|measurement=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
         collector.inputQueue.maxPending: "8096"
-        collector.keystore.file.location: /opt/app/VESCollector/etc/keystore
-        collector.keystore.passwordfile: /opt/app/VESCollector/etc/passwordfile
+        collector.keystore.file.location: /opt/app/dcae-certificate/cert.jks
+        collector.keystore.passwordfile: /opt/app/dcae-certificate/jks.pass
         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.1.json\",\"v7\":\"./etc/CommonEventFormat_30.0.1.json\"}"
         collector.service.port: "8080"
         collector.service.secure.port: "8443"
         event.transform.flag: "0"
-        auth.method: "noAuth"
+        auth.method:
+          get_input: auth_method
         header.authlist: "sample1,$2a$10$0buh.2WeYwN868YMwnNNEuNEAMNYVU9.FSMJGyIKV3dGET/7oGOi6"
         services_calls: []
         streams_publishes:
-            ves-fault:
-              dmaap_info:
-                topic_url:
-                  get_input: ves_fault_publish_url
-              type: message_router
-            ves-measurement:
-              dmaap_info:
-                topic_url:
-                  get_input: ves_measurement_publish_url
-              type: message_router
-            ves-notification:
-              dmaap_info:
-                topic_url:
-                  get_input: ves_notification_publish_url
-              type: message_router
-            ves-pnfRegistration:
-              dmaap_info:
-                topic_url:
-                  get_input: ves_pnfRegistration_publish_url
-              type: message_router
-            ves-heartbeat:
-              dmaap_info:
-                topic_url:
-                  get_input: ves_heartbeat_publish_url
-              type: message_router
-            ves-other:
-              dmaap_info:
-                topic_url:
-                  get_input: ves_other_publish_url
-              type: message_router
+          ves-fault:
+            dmaap_info:
+              topic_url:
+                get_input: ves_fault_publish_url
+            type: message_router
+          ves-measurement:
+            dmaap_info:
+              topic_url:
+                get_input: ves_measurement_publish_url
+            type: message_router
+          ves-notification:
+            dmaap_info:
+              topic_url:
+                get_input: ves_notification_publish_url
+            type: message_router
+          ves-pnfRegistration:
+            dmaap_info:
+              topic_url:
+                get_input: ves_pnfRegistration_publish_url
+            type: message_router
+          ves-heartbeat:
+            dmaap_info:
+              topic_url:
+                get_input: ves_heartbeat_publish_url
+            type: message_router
+          ves-other:
+            dmaap_info:
+              topic_url:
+                get_input: ves_other_publish_url
+            type: message_router
         collector.dynamic.config.update.frequency: "5"
       docker_config:
         healthcheck:
@@ -121,10 +143,14 @@ node_templates:
       image:
         get_input: tag_version
       replicas: {get_input: replicas}
-      name: 'dcae-ves-collector'
-      dns_name: 'dcae-ves-collector'
+      name:
+        get_input: component_name
+      dns_name:
+        get_input: dns_component_name
       log_info:
         log_directory: "/opt/app/VESCollector/logs/ecomp"
-    type: dcae.nodes.ContainerizedPlatformComponent
-
-
+      tls_info:
+        cert_directory: '/opt/app/dcae-certificate/'
+        use_tls:
+          get_input: enable_tls
+    type: dcae.nodes.ContainerizedPlatformComponent
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 9f97f47..8bb9bbc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>k8s-bootstrap-container</artifactId>
   <name>dcaegen2-deployments-k8s-bootstrap-container</name>
-  <version>1.9.0-SNAPSHOT</version>
+  <version>1.9.1-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <packaging>pom</packaging>
 

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index e47ccd6..a5f7787 100755 (executable)
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -219,6 +219,7 @@ deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml
 # tca, ves, prh, hv-ves, datafile-collector can be deployed simultaneously
 deploy tca k8s-tca.yaml k8s-tca-inputs.yaml &
 deploy ves k8s-ves.yaml k8s-ves-inputs.yaml &
+deploy ves-tls k8s-ves.yaml k8s-ves-inputs-tls.yaml &
 deploy prh k8s-prh.yaml k8s-prh-inputs.yaml &
 deploy hv-ves k8s-hv-ves.yaml k8s-hv_ves-inputs.yaml &
 # holmes_rules must be deployed before holmes_engine, but holmes_rules can go in parallel with other service components

diff --git a/version.properties b/version.properties
index 07578e5..d8c7e9d 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1\r
-minor=2\r
-patch=0\r
+minor=9\r
+patch=1\r
 base_version=${major}.${minor}.${patch}\r
 release_version=${base_version}\r
 snapshot_version=${base_version}-SNAPSHOT\r