X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;h=d9c20cf2a33eaf4cd2729374a74fe45da7976645;hb=2242f0193eb17ebd9143f9e8afb8bcefda9672d7;hp=4d608577232dbf2e6f8e16849a86900291a6c7ca;hpb=47d703698414dbdb160a7e86c728df3ce0a752cb;p=ccsdk%2Fdistribution.git diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh index 4d608577..d9c20cf2 100644 --- a/odlsli/src/main/scripts/startODL.sh +++ b/odlsli/src/main/scripts/startODL.sh @@ -25,23 +25,26 @@ # Install SDN-C platform components if not already installed and start container ODL_HOME=${ODL_HOME:-/opt/opendaylight} -ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} +#ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} +ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-admin} CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} SLEEP_TIME=${SLEEP_TIME:-120} -MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} -INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim} +INSTALLED_DIR=${INSTALLED_FILE:-${ODL_HOME}/current/daexim} +MYSQL_HOST=${MYSQL_HOST:-dbhost} +MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0} # # Wait for database # -echo "Waiting for mysql" -until mysql -h dbhost -u root -p${MYSQL_PASSWD} mysql &> /dev/null +echo -e "\nWaiting for mysql:(${MYSQL_HOST})" +until mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} mysql &> /dev/null do printf "." - sleep 1 + sleep 10 done -echo -e "\nmysql ready" +echo -e "\nmysql:(${MYSQL_HOST}) is ready." + if [ ! -d ${INSTALLED_DIR} ] then