Fix issues in start script
Change-Id: I9f78611d97021c27496c424930f8f0bca83a427c
Issue-ID: SDNC-1371
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id:
484471f013194ac337da337bb324475d267a917f
A1_TRUSTSTORE=${SDNC_STORE_DIR}/truststore.a1.adapter.jks
ONAP_TRUSTSTORE=${SDNC_STORE_DIR}/truststoreONAPall.jks
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
then
keytool -importkeystore -srckeystore ${A1_TRUSTSTORE} -srcstorepass ${A1_TRUSTSTORE_PASSWORD} -destkeystore ${ONAP_TRUSTSTORE} -deststorepass changeit
fi
printf "%s\n" " PEER_ODL_CLUSTER=$PEER_ODL_CLUSTER"
printf "%s\n" " SDNR_NORTHBOUND=$SDNR_NORTHBOUND"
printf "%s\n" " AAF_ENABLED=$SDNC_AAF_ENABLED"
printf "%s\n" " PEER_ODL_CLUSTER=$PEER_ODL_CLUSTER"
printf "%s\n" " SDNR_NORTHBOUND=$SDNR_NORTHBOUND"
printf "%s\n" " AAF_ENABLED=$SDNC_AAF_ENABLED"
+printf "%s\n" " OOM_ENABLED=$OOM_ENABLED"
if "$SDNC_AAF_ENABLED"; then
export SDNC_AAF_STORE_DIR=/opt/app/osaaf/local
if "$SDNC_AAF_ENABLED"; then
export SDNC_AAF_STORE_DIR=/opt/app/osaaf/local
if [ ! -f "${SDNC_HOME}"/.installed ]
then
if [ ! -f "${SDNC_HOME}"/.installed ]
then
+ if ! $OOM_ENABLED; then
# for integration testing. In OOM, a separate job takes care of installing it.
if $SDNC_DB_INIT; then
printf "Installing SDN-C database\n"
"${SDNC_HOME}"/bin/installSdncDb.sh
fi
# for integration testing. In OOM, a separate job takes care of installing it.
if $SDNC_DB_INIT; then
printf "Installing SDN-C database\n"
"${SDNC_HOME}"/bin/installSdncDb.sh
fi
- printf "Installing SDN-C keyStore\n"
- "${SDNC_HOME}"/bin/addSdncKeyStore.sh
- printf "Installing A1-adapter trustStore\n"
- "${SDNC_HOME}"/bin/addA1TrustStore.sh
#${CCSDK_HOME}/bin/installOdlHostKey.sh
#${CCSDK_HOME}/bin/installOdlHostKey.sh
+ printf "Installing SDN-C keyStore\n"
+ "${SDNC_HOME}"/bin/addSdncKeyStore.sh
+ printf "Installing A1-adapter trustStore\n"
+ "${SDNC_HOME}"/bin/addA1TrustStore.sh
+
if $SDNRWT ; then install_sdnrwt_features ; fi
# The enable_odl_cluster call should not be moved above this line as the cleanFeatureBoot will overwrite entries. Ex: odl-jolokia
if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
if $SDNRWT ; then install_sdnrwt_features ; fi
# The enable_odl_cluster call should not be moved above this line as the cleanFeatureBoot will overwrite entries. Ex: odl-jolokia
if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi