From ff5947f44df7f274e443768bdbe80928e96c412d Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Mon, 19 Apr 2021 15:32:44 +0200 Subject: [PATCH] [COMMON] Add custom certs into AAF truststore Instead of creating a truststore nobody is using when using AAF, let's reuse AAF truststore and onboard certs in it. Issue-ID: OOM-2730 Signed-off-by: Sylvain Desbureaux Change-Id: Idb1af0357e286d9536c5d16f592068b61f885b0a --- kubernetes/common/cert-wrapper/resources/import-custom-certs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh b/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh index 87e584c78e..b5a1d57649 100755 --- a/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh +++ b/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh @@ -50,7 +50,8 @@ done # Prepare truststore output file if [ "$AAF_ENABLED" == "true" ] then - mv $WORK_DIR/$ONAP_TRUSTSTORE $WORK_DIR/$TRUSTSTORE_OUTPUT_FILENAME + echo "AAF is enabled, use 'AAF' truststore" + export TRUSTSTORE_OUTPUT_FILENAME=${ONAP_TRUSTSTORE} else echo "AAF is disabled, using JRE truststore" cp $JRE_TRUSTSTORE $WORK_DIR/$TRUSTSTORE_OUTPUT_FILENAME -- 2.16.6