From 12e6aba510f0ccb2ea21ea87ba77a08bc044cd0a Mon Sep 17 00:00:00 2001 From: Krzysztof Opasiak Date: Thu, 4 Mar 2021 22:14:51 +0100 Subject: Revert "[AAI][SPARKY] Automatically retrieve certs" This reverts commit a9a41d84026f059aae70f9042c0b99af5b72e619. aai-sparky-be with this patch fails often in the gate. I expect this to be related to this patch as the stack trace contains below error message: java.io.IOException: keystore password was incorrect Issue-ID: OOM-2683 Signed-off-by: Krzysztof Opasiak Change-Id: I53650671eae700ef553b2f9158744ab72d881820 --- .../aai-sparky-be/resources/config/portal/cadi.properties | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties') diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties index baefd9806b..1f154b6101 100644 --- a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties +++ b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/cadi.properties @@ -6,18 +6,14 @@ aaf_url=<%=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1 # AAF Environment Designation #if you are running aaf service from a docker image you have to use aaf service IP and port number -aaf_id={{ .Values.certInitializer.fqi }} +aaf_id={{.Values.config.aafUsername}} #Encrypt the password using AAF Jar -aaf_password={{ .Values.certInitializer.aafDeployPass }} +aaf_password={{.Values.config.aafPassword}} # Sample CADI Properties, from CADI 1.4.2 #hostname=org.onap.aai.orr csp_domain=PROD # Add Absolute path to Keyfile -cadi_keyfile={{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.keyfile -cadi_keystore={{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.p12 -cadi_keystore_password=${KEYSTORE_PASSWORD} - -cadi_alias={{ .Values.certInitializer.fqi }} +cadi_keyfile={{.Values.config.cadiKeyFile}} # This is required to accept Certificate Authentication from Certman certificates. # can be TEST, IST or PROD @@ -27,9 +23,9 @@ aaf_env=DEV cadi_loglevel=DEBUG # Add Absolute path to truststore2018.jks -cadi_truststore={{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.trust.jks +cadi_truststore={{.Values.config.cadiTrustStore}} # Note: This is the ONLY password that doesn't have to be encrypted. All Java's TrustStores are this passcode by default, because they are public certs -cadi_truststore_password=${TRUSTSTORE_PASSWORD} +cadi_truststore_password={{.Values.config.cadiTrustStorePassword}} # how to turn on SSL Logging #javax.net.debug=ssl -- cgit 1.2.3-korg