summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-04-19 15:32:44 +0200
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-04-19 15:32:44 +0200
commitff5947f44df7f274e443768bdbe80928e96c412d (patch)
tree3b09c76ca6b424a72feca467bc0995d822eaeade
parent1b162638763115959a0960a1195618f571d5499b (diff)
[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 <sylvain.desbureaux@orange.com> Change-Id: Idb1af0357e286d9536c5d16f592068b61f885b0a
-rwxr-xr-xkubernetes/common/cert-wrapper/resources/import-custom-certs.sh3
1 files changed, 2 insertions, 1 deletions
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