Update bootstrap container blueprints2.1.4

1. Update HV-VES and PRH default image tag
- HV-VES top up to 1.5.0
- PRH top up to 1.5.4
Issue-ID: DCAEGEN2-2242

2. [DCAE] Adapt DCAE blueprints to CFY DCAE K8S plugin version 3.x.x - fix
for static FQDN override
Issue-ID: DCAEGEN2-2386

3. Update VES CFY blueprint
Updated VES image version to 1.7.4.
Updated some properties format to match supported format in VES.
Issue-ID: DCAEGEN2-2264

4. Adjust VES and HV-VES collectors to use certificates from CMPv2
- Modify VES blueprint
- Modify HV-VES blueprint
Issue-ID: DCAEGEN2-1794
Issue-ID: DCAEGEN2-2195

Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>
Change-Id: I6abadcaa0bd8a51f1f4bba7923c382312baa4224
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>

1 files changed, 35 insertions, 1 deletions

diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml
index d76922b..103c964 100644
--- a/blueprints/k8s-hv-ves.yaml
+++ b/blueprints/k8s-hv-ves.yaml
@@ -27,7 +27,7 @@ imports:
 inputs:
   tag_version:
     type: string
-    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.4.0'
+    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.5.0'
   service_component_type:
     type: string
     default: 'dcae-hv-ves-collector'
@@ -85,6 +85,27 @@ inputs:
   use_tls:
     type: boolean
     default: true
+  service_component_name_override:
+    type: string
+    default: "dcae-hv-ves-collector"
+  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:
@@ -125,9 +146,22 @@ node_templates:
       replicas: { get_input: replicas }
       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: service_component_type } ] }
       tls_info:
         cert_directory: '/etc/ves-hv/ssl'
         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: "JKS"
+        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