From 2af5079ba7cc09fda2c19a3f627299b3ef655227 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Mon, 27 Mar 2023 17:11:27 +0200 Subject: [SDNC] Chart cleanup from TLS/AAF options Remove checks and add the usage of common templates Add information about external access to SDNC-callhome and add ingress setup for it Issue-ID: OOM-3122 Signed-off-by: Andreas Geissler Change-Id: I7b32832ee31d811c23b4eaa5d43f7aa9d767c353 --- kubernetes/sdnc/resources/config/conf/aaiclient.properties | 4 ---- kubernetes/sdnc/resources/config/conf/mountpoint-registrar.properties | 4 ---- 2 files changed, 8 deletions(-) (limited to 'kubernetes/sdnc/resources/config') diff --git a/kubernetes/sdnc/resources/config/conf/aaiclient.properties b/kubernetes/sdnc/resources/config/conf/aaiclient.properties index 5108a9d005..971a446d64 100755 --- a/kubernetes/sdnc/resources/config/conf/aaiclient.properties +++ b/kubernetes/sdnc/resources/config/conf/aaiclient.properties @@ -38,11 +38,7 @@ org.onap.ccsdk.sli.adaptors.aai.application=openECOMP # # Configuration file for A&AI Client # -{{- if (include "common.needTLS" .) }} -org.onap.ccsdk.sli.adaptors.aai.uri=https://aai.{{.Release.Namespace}}:8443 -{{- else }} org.onap.ccsdk.sli.adaptors.aai.uri=http://aai.{{.Release.Namespace}}:80 -{{- end }} connection.timeout=60000 read.timeout=60000 diff --git a/kubernetes/sdnc/resources/config/conf/mountpoint-registrar.properties b/kubernetes/sdnc/resources/config/conf/mountpoint-registrar.properties index 303e504aa9..51cb9be56f 100644 --- a/kubernetes/sdnc/resources/config/conf/mountpoint-registrar.properties +++ b/kubernetes/sdnc/resources/config/conf/mountpoint-registrar.properties @@ -1,10 +1,6 @@ [general] dmaapEnabled={{.Values.config.sdnr.mountpointRegistrarEnabled | default "false"}} -{{ if .Values.global.aafEnabled }} -baseUrl=https://localhost:{{.Values.service.internalPort4}} -{{- else }} baseUrl=http://localhost:{{.Values.service.internalPort}} -{{- end }} sdnrUser=${ODL_ADMIN_USERNAME} sdnrPasswd=${ODL_ADMIN_PASSWORD} -- cgit 1.2.3-korg