Merge "[COMMON] Add custom certs into AAF truststore"

diff --cc kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
index ec1ce94,b5a1d57..cb4153e
--- 1/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
--- 2/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
+++ b/kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
@@@ -48,17 -47,11 +48,18 @@@ for f in $CERTS_DIR/*; d
    fi
  done
  
 +for f in $MORE_CERTS_DIR/*; do
 +  if [ ${f: -4} == ".pem" ]
 +    then
 +      cp $f $WORK_DIR/.
 +  fi
 +done
 +
  # Prepare truststore output file
 -if [ "$AAF_ENABLED" == "true" ]
 +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