Merge "[OOM] Update Linux SSL Truststore /etc/ssl"

diff --combined kubernetes/common/cert-wrapper/resources/import-custom-certs.sh
index eb07a74,0667ae2..fa3de03
--- 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
@@@ -22,6 -22,7 +22,7 @@@ WORK_DIR=${WORK_DIR:-/updatedTruststore
  ONAP_TRUSTSTORE=${ONAP_TRUSTSTORE:-truststoreONAPall.jks}
  JRE_TRUSTSTORE=${JRE_TRUSTSTORE:-$JAVA_HOME/lib/security/cacerts}
  TRUSTSTORE_OUTPUT_FILENAME=${TRUSTSTORE_OUTPUT_FILENAME:-truststore.jks}
+ SSL_WORKDIR=${SSL_WORKDIR:-/usr/local/share/ca-certificates}
  
  mkdir -p $WORK_DIR
  
@@@ -37,10 -38,10 +38,10 @@@ for f in $CERTS_DIR/*; d
      # Dont use onap truststore when aaf is disabled
      continue
    fi
 -  if [ ${f: -3} = ".sh" ]; then
 +  if echo $f | grep '\.sh$' >/dev/null; then
      continue
    fi
 -  if [ ${f: -4} = ".b64" ]
 +  if echo $f | grep '\.b64$' >/dev/null; then
      then
        base64 -d $f > $WORK_DIR/`basename $f .b64`
      else
@@@ -49,7 -50,8 +50,7 @@@
  done
  
  for f in $MORE_CERTS_DIR/*; do
 -  if [ ${f: -4} == ".pem" ]
 -    then
 +  if echo $f | grep '\.pem$' >/dev/null; then
        cp $f $WORK_DIR/.
    fi
  done
@@@ -66,7 -68,7 +67,7 @@@ f
  
  # Import Custom Certificates
  for f in $WORK_DIR/*; do
 -  if [ ${f: -4} = ".pem" ]; then
 +  if echo $f | grep '\.pem$' >/dev/null; then
      echo "importing certificate: $f"
      keytool -import -file $f -alias `basename $f` -keystore $WORK_DIR/$TRUSTSTORE_OUTPUT_FILENAME -storepass $TRUSTSTORE_PASSWORD -noprompt
      if [ $? != 0 ]; then
@@@ -75,3 -77,15 +76,15 @@@
      fi
    fi
  done
+ 
+ # Import certificates to Linux SSL Truststore
+ cp $CERTS_DIR/*.crt $SSL_WORKDIR/.
+ cp $MORE_CERTS_DIR/*.crt $SSL_WORKDIR/.
+ update-ca-certificates
+ if [ $? != 0 ]
+   then
+     echo "failed importing certificates"
+     exit 1
+   else
+     cp /etc/ssl/certs/ca-certificates.crt $WORK_DIR/.
+ fi