From 99cdec225e8f86646715d56748daa412e9488ce7 Mon Sep 17 00:00:00 2001 From: burdziak Date: Mon, 21 Jan 2019 08:23:42 +0100 Subject: Improved syntax and security settings Change-Id: I501f0fd44dd88f088296d5c263b95ee578ddda56 Issue-ID: DCAEGEN2-1100 Signed-off-by: burdziak --- blueprints/k8s-prh.yaml-template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/blueprints/k8s-prh.yaml-template b/blueprints/k8s-prh.yaml-template index 198ece3..c6f1652 100644 --- a/blueprints/k8s-prh.yaml-template +++ b/blueprints/k8s-prh.yaml-template @@ -98,11 +98,10 @@ node_templates: aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors: true aai.aaiClientConfiguration.aaiBasePath: "/aai/v12" aai.aaiClientConfiguration.aaiPnfPath: "/network/pnfs/pnf" - secure.configuration.keyFile: "/opt/app/prh/local/org.onap.prh.keyfile" - secure.configuration.trustStore: "/opt/app/prh/local/org.onap.prh.trust.jks" - secure.configuration.trustStorePassword: "change it" - secure.configuration.keyStore: "/opt/app/prh/local/org.onap.prh.p12" - secure.configuration.keyStorePassword: "change it" + secure.configuration.trustStore: "/opt/app/prh/etc/cert/trust.jks" + secure.configuration.trustStorePasswordPath: "/opt/app/prh/etc/cert/trust.pass" + secure.configuration.keyStore: "/opt/app/prh/etc/cert/key.p12" + secure.configuration.keyStorePasswordPath: "/opt/app/prh/etc/cert/key.pass" secure.configuration.enableAaiCertAuth: { get_input: secureEnableCert } secure.configuration.enableDmaapCertAuth: { get_input: secureEnableCert } host_port: @@ -116,10 +115,13 @@ node_templates: timeout: 1s type: http image: - get_input: { get_input: tag_version } + { get_input: tag_version } replicas: {get_input: replicas} name: 'dcae-prh' dns_name: 'dcae-prh' log_info: log_directory: "/opt/app/prh/logs" + tls_info: + cert_directory: '/opt/app/prh/etc/cert/' + use_tls: true type: dcae.nodes.ContainerizedPlatformComponent -- cgit 1.2.3-korg