A1_TRUSTSTORE=${SDNC_STORE_DIR}/truststore.a1.adapter.jks
ONAP_TRUSTSTORE=${SDNC_STORE_DIR}/truststoreONAPall.jks
-if [ -f ${A1_TRUST_STORE} ]
+if [ -f ${A1_TRUSTSTORE} -a "${A1_TRUSTSTORE_PASSWORD}" != "" ]
then
keytool -importkeystore -srckeystore ${A1_TRUSTSTORE} -srcstorepass ${A1_TRUSTSTORE_PASSWORD} -destkeystore ${ONAP_TRUSTSTORE} -deststorepass changeit
fi
echo " PEER_ODL_CLUSTER=$PEER_ODL_CLUSTER"
echo " SDNR_NORTHBOUND=$SDNR_NORTHBOUND"
echo " AAF_ENABLED=$SDNC_AAF_ENABLED"
+echo " OOM_ENABLED=$OOM_ENABLED"
if $SDNC_AAF_ENABLED; then
export SDNC_AAF_STORE_DIR=/opt/app/osaaf/local
fi
fi
-if $OOM_ENABLED; then
+if ! $OOM_ENABLED; then
#
# Wait for database
#
if [ ! -f ${SDNC_HOME}/.installed ]
then
- if $OOM_ENABLED; then
+ if ! $OOM_ENABLED; then
# for integration testing. In OOM, a separate job takes care of installing it.
if $SDNC_DB_INIT; then
echo "Installing SDN-C database"
${SDNC_HOME}/bin/installSdncDb.sh
fi
- echo "Installing SDN-C keyStore"
- ${SDNC_HOME}/bin/addSdncKeyStore.sh
- echo "Installing A1-adapter trustStore"
- ${SDNC_HOME}/bin/addA1TrustStore.sh
#${CCSDK_HOME}/bin/installOdlHostKey.sh
fi
fi
+ echo "Installing SDN-C keyStore"
+ ${SDNC_HOME}/bin/addSdncKeyStore.sh
+ echo "Installing A1-adapter trustStore"
+ ${SDNC_HOME}/bin/addA1TrustStore.sh
+
if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
if $SDNRWT ; then install_sdnrwt_features ; fi