[DCAE] INFO.yaml update

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

diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml
index 3723200..1b12816 100644 (file)
--- a/blueprints/k8s-hv-ves.yaml
+++ b/blueprints/k8s-hv-ves.yaml
@@ -1,9 +1,10 @@
 # -*- indent-tabs-mode: nil -*- # vi: set expandtab:
 #
-# ============LICENSE_START====================================================
-# =============================================================================
+# ============LICENSE_START========================================================
+# =================================================================================
 # Copyright (C) 2018-2019 NOKIA
-# =============================================================================
+# Modifications Copyright (c) 2020-2021 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
@@ -15,21 +16,24 @@
 # 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======================================================
+# ============LICENSE_END==========================================================
 
 tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - https://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
+  - plugin:k8splugin?version=>=3.4.3,<4.0.0
 
 inputs:
   tag_version:
     type: string
-    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.3.0'
-  hv_ves_name:
+    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.9.1'
+  service_component_type:
     type: string
     default: 'dcae-hv-ves-collector'
+  service_id:
+    type: string
+    default: "dcae-hv-ves-collector"
   replicas:
     type: integer
     description: number of instances
@@ -65,7 +69,7 @@ inputs:
     default: 5
   security_ssl_disable:
     type: boolean
-    default: true
+    default: false
   security_keys_key_store_file:
     type: string
     default: '/etc/ves-hv/ssl/cert.jks'
@@ -78,6 +82,34 @@ inputs:
   security_keys_trust_store_password_file:
     type: string
     default: '/etc/ves-hv/ssl/trust.pass'
+  use_tls:
+    type: boolean
+    default: true
+  service_component_name_override:
+    type: string
+    default: "dcae-hv-ves-collector"
+  external_cert_cert_type:
+    type: string
+    description: Output type
+    default: "JKS"
+  external_cert_ca_name:
+    type: string
+    description: Name of Certificate Authority configured on CertService side.
+    default: "RA"
+  external_cert_common_name:
+    type: string
+    description: Common name which should be present in certificate.
+    default: "dcae-hv-ves-collector"
+  external_cert_sans:
+    type: string
+    description: "List of Subject Alternative Names (SANs) which should be present
+      in certificate. Delimiter - , Should contain common_name value and other FQDNs
+      under which given component is accessible."
+    default: "dcae-hv-ves-collector,hv-ves-collector,hv-ves"
+  external_cert_use_external_tls:
+    type: boolean
+    description: Flag to indicate external tls enable/disable.
+    default: false
 node_templates:
   hv-ves:
     interfaces:
@@ -85,7 +117,7 @@ node_templates:
         start:
           inputs:
             envs:
-              JAVA_OPTS: { concat: [ '-Dlogback.configurationFile=/etc/ONAP/', { get_input: hv_ves_name }, '/logback.xml' ] }
+              JAVA_OPTS: { concat: [ '-Dlogback.configurationFile=/etc/ONAP/', { get_input: service_component_type }, '/logback.xml' ] }
     properties:
       application_config:
         logLevel: { get_input: log_level }
@@ -112,15 +144,29 @@ node_templates:
           script: "/opt/ves-hv-collector/healthcheck.sh"
           interval: 15s
           timeout: 2s
+        ports:
+          - { concat: [ { get_input: container_port }, ':', { get_input: host_port } ] }
       image: { get_input: tag_version }
       replicas: { get_input: replicas }
-      name: { get_input: hv_ves_name }
-      dns_name: { get_input: hv_ves_name }
-      container_port: { get_input: container_port }
-      host_port: { get_input: host_port }
+      service_component_type: { get_input: service_component_type }
+      service_id: { get_input: service_id }
+      service_component_name_override: { get_input: service_component_name_override }
       log_info:
-        log_directory: { concat: [ '/var/log/ONAP/', { get_input: hv_ves_name } ] }
+        log_directory: { concat: [ '/var/log/ONAP/', { get_input: service_component_type } ] }
       tls_info:
         cert_directory: '/etc/ves-hv/ssl'
-        use_tls: false
-    type: dcae.nodes.ContainerizedPlatformComponent
+        use_tls: { get_input: use_tls }
+      external_cert:
+        external_cert_directory: '/etc/ves-hv/ssl'
+        use_external_tls:
+          get_input: external_cert_use_external_tls
+        cert_type:
+          get_input: external_cert_cert_type
+        ca_name:
+          get_input: external_cert_ca_name
+        external_certificate_parameters:
+          common_name:
+            get_input: external_cert_common_name
+          sans:
+            get_input: external_cert_sans
+    type: dcae.nodes.ContainerizedServiceComponent