diff options
| author |   Kornel Janiak <kornel.janiak@nokia.com> | 2020-09-18 12:20:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-09-18 12:20:36 +0000 |
| commit | 427278491d01661b16d5e63a9e5c43c4662f085f (patch) | |
| tree | 921165a055eb511abd82dd16562593533d59c318 | |
| parent | 9226eb41a162c4614b2df127032c1c93ee2c544e (diff) | |
| parent | 5cca534d6e25561915e8a2cdbf64a2cd2d4acd9d (diff) | |
Merge "Adjust VES and HV-VES collectors to use certificates from CMPv2"
| -rw-r--r-- | blueprints/k8s-hv-ves.yaml | 9 | ||||
| -rw-r--r-- | blueprints/k8s-ves.yaml | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml index 103c964..d6f753a 100644 --- a/blueprints/k8s-hv-ves.yaml +++ b/blueprints/k8s-hv-ves.yaml @@ -22,7 +22,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.3.0 + - plugin:k8splugin?version=3.4.1 inputs: tag_version: @@ -88,6 +88,10 @@ inputs: 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. @@ -156,7 +160,8 @@ node_templates: external_cert_directory: '/etc/ves-hv/ssl' use_external_tls: get_input: external_cert_use_external_tls - cert_type: "JKS" + cert_type: + get_input: external_cert_cert_type ca_name: get_input: external_cert_ca_name external_certificate_parameters: diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml index f83fa3b..845857a 100644 --- a/blueprints/k8s-ves.yaml +++ b/blueprints/k8s-ves.yaml @@ -22,7 +22,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.3.0 + - plugin:k8splugin?version=3.4.1 inputs: ves_other_publish_url: @@ -57,7 +57,7 @@ inputs: default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT" tag_version: type: string - default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.7.4" + default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.7.5" internal_port: type: string description: Kubernetes node port on which collector is exposed @@ -95,6 +95,10 @@ inputs: enable_tls: type: boolean default: false + 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. @@ -239,7 +243,8 @@ node_templates: external_cert_directory: '/opt/app/dcae-certificate/' use_external_tls: get_input: external_cert_use_external_tls - cert_type: "JKS" + cert_type: + get_input: external_cert_cert_type ca_name: get_input: external_cert_ca_name external_certificate_parameters: |