X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;h=310acfd7202f6d86d3af24ffd349b919c7bc59cb;hb=0f24452edf1361992895bf65545be25fe8ccd821;hp=50e45ce0c0fac0477b3175eb8772a0587d22e1e9;hpb=912f98b9cdfe0f636239b8f94fccf7858bffac26;p=ccsdk%2Fdistribution.git

diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index 50e45ce0..310acfd7 100644
--- a/odlsli/src/main/scripts/startODL.sh
+++ b/odlsli/src/main/scripts/startODL.sh
@@ -5,7 +5,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-# 							reserved.
+#                             reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,43 +24,42 @@
 
 # Install SDN-C platform components if not already installed and start container
 
-ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
+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
-	echo "Installing SDN-C database"
-	${CCSDK_HOME}/bin/installSdncDb.sh
-	echo "Starting OpenDaylight"
-	${ODL_HOME}/bin/start
-	echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
-	sleep ${SLEEP_TIME}
-	echo "Installing SDN-C platform features"
-	${CCSDK_HOME}/bin/installFeatures.sh
-	if [ -x ${CCSDK_HOME}/svclogic/bin/install.sh ]
-	then
-		echo "Installing directed graphs"
-		${CCSDK_HOME}/svclogic/bin/install.sh
-	fi
-
+    mkdir -p ${INSTALLED_DIR}
+fi
 
-	echo "Restarting OpenDaylight"
-	${ODL_HOME}/bin/stop
-	echo "Installed at `date`" > ${CCSDK_HOME}/.installed
+if [ ! -f ${INSTALLED_DIR}/.installed ]
+then
+    echo "Installing SDN-C database"
+    ${CCSDK_HOME}/bin/installSdncDb.sh
+    # echo "Installing OpenDaylight host key"
+    # ${CCSDK_HOME}/bin/installOdlHostKey.sh
+    if [ -x ${CCSDK_HOME}/svclogic/bin/install.sh ]
+    then
+        echo "Installing directed graphs"
+        ${CCSDK_HOME}/svclogic/bin/install.sh
+    fi
+    echo "Installed at `date`" > ${INSTALLED_DIR}/.installed
 fi
 
-exec ${ODL_HOME}/bin/karaf
+exec ${ODL_HOME}/bin/karaf server