X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;h=ad5c8bc6c7b3683c0a0bf59cbd22357ed780275b;hp=5ca40796eba5bd776f143ca39072b0167d814c34;hb=19b75a8b179af090ed4d275a4c85515148c1f890;hpb=a16cced961d7d298ae3cc8ede231546e6b2f98c1

diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index 5ca40796..ad5c8bc6 100644
--- a/odlsli/src/main/scripts/startODL.sh
+++ b/odlsli/src/main/scripts/startODL.sh
@@ -30,11 +30,6 @@ CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
 
-# Start karaf
-echo "Starting OpenDaylight"
-${ODL_HOME}/bin/start
-echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
-sleep ${SLEEP_TIME}
 
 #
 # Wait for database
@@ -51,7 +46,10 @@ if [ ! -f ${CCSDK_HOME}/.installed ]
 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 ]
@@ -60,8 +58,11 @@ then
         ${CCSDK_HOME}/svclogic/bin/install.sh
     fi
 
+    echo "Restarting OpenDaylight"
+    ${ODL_HOME}/bin/stop
+    echo "Waiting 60 seconds for OpenDaylight stop to complete"
+    sleep 60
     echo "Installed at `date`" > ${CCSDK_HOME}/.installed
 fi
 
-# Start client to force a wait on state of karaf server
-exec ${ODL_HOME}/bin/client
+exec ${ODL_HOME}/bin/karaf