summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorefiacor <fiachra.corcoran@est.tech>2020-06-23 10:37:04 +0100
committerefiacor <fiachra.corcoran@est.tech>2020-07-02 13:24:45 +0100
commit39f8702d344b22f472bab56eee1f0cf9b5e2d815 (patch)
treec1ce9204f3f8ed20bc273728d4816077debeaa32
parentd6a63428b1bc02e84aaa764556eb5c49f25d0b8e (diff)
[PMSH] Add enable_tls flag to bp inputs
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Issue-ID: DCAEGEN2-2146 Change-Id: Iabe484ca48763d896933c06a6b99f1328e1a2d74
-rw-r--r--blueprints/k8s-pmsh.yaml14
1 files changed, 11 insertions, 3 deletions
diff --git a/blueprints/k8s-pmsh.yaml b/blueprints/k8s-pmsh.yaml
index 1304d68..da90a23 100644
--- a/blueprints/k8s-pmsh.yaml
+++ b/blueprints/k8s-pmsh.yaml
@@ -28,7 +28,7 @@ inputs:
tag_version:
type: string
description: Docker image to be used
- default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.0.3'
+ default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.1.0'
replicas:
type: integer
description: Number of instances
@@ -75,6 +75,13 @@ inputs:
pgaas_cluster_name:
type: string
default: 'dcae-pg-primary.onap'
+ enable_tls:
+ type: boolean
+ default: true
+ protocol:
+ type: string
+ description: PMSH protocol. If enable_tls is false, set to http
+ default: 'https'
node_templates:
pgaasvm:
type: dcae.nodes.pgaas.database
@@ -107,6 +114,7 @@ node_templates:
service_component_type: 'dcae-pmsh'
service_component_name_override: 'dcae-pmsh'
application_config:
+ enable_tls: { get_input: enable_tls }
aaf_identity: 'dcae@dcae.onap.org'
aaf_password: 'demo123456!'
operational_policy_name: { get_input: operational_policy_name }
@@ -140,11 +148,11 @@ node_templates:
endpoint: /healthcheck
interval: 15s
timeout: 1s
- type: https
+ type: { get_input: protocol }
image: { get_input: tag_version }
replicas: { get_input: replicas }
log_info:
log_directory: '/var/log/ONAP/dcaegen2/services/pmsh'
tls_info:
cert_directory: '/opt/app/pmsh/etc/certs'
- use_tls: true
+ use_tls: { get_input: enable_tls }