X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;h=310acfd7202f6d86d3af24ffd349b919c7bc59cb;hb=0f24452edf1361992895bf65545be25fe8ccd821;hp=8c45dda5d3710964a9f289ba1d8fb16bd199ff6f;hpb=e14a02086c9119532f9153c78346d5c1d6789ca9;p=ccsdk%2Fdistribution.git diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh index 8c45dda5..310acfd7 100644 --- a/odlsli/src/main/scripts/startODL.sh +++ b/odlsli/src/main/scripts/startODL.sh @@ -28,21 +28,27 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight} ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} SLEEP_TIME=${SLEEP_TIME:-120} -MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} +MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0} +INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim} # # Wait for database # echo "Waiting for mysql" -until mysql -h dbhost -u root -p${MYSQL_PASSWD} mysql &> /dev/null +until mysql -h dbhost -u root -p${MYSQL_ROOT_PASSWORD} mysql &> /dev/null do printf "." sleep 1 done echo -e "\nmysql ready" -if [ ! -f ${CCSDK_HOME}/.installed ] +if [ ! -d ${INSTALLED_DIR} ] +then + mkdir -p ${INSTALLED_DIR} +fi + +if [ ! -f ${INSTALLED_DIR}/.installed ] then echo "Installing SDN-C database" ${CCSDK_HOME}/bin/installSdncDb.sh @@ -53,7 +59,7 @@ then echo "Installing directed graphs" ${CCSDK_HOME}/svclogic/bin/install.sh fi - echo "Installed at `date`" > ${CCSDK_HOME}/.installed + echo "Installed at `date`" > ${INSTALLED_DIR}/.installed fi exec ${ODL_HOME}/bin/karaf server