X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;h=6b42937c0801a68975ee66ab1be55ff203d6db1c;hp=75f51b3502d371c87e27f3e716411fca066fcb17;hb=refs%2Fchanges%2F11%2F42811%2F1;hpb=e2693ccbcb97d2ab5767cfde00349a9d1aa946f6

diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index 75f51b35..6b42937c 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,11 @@ if [ ! -f ${CCSDK_HOME}/.installed ]
 then
     echo "Installing SDN-C database"
     ${CCSDK_HOME}/bin/installSdncDb.sh
-
+    echo "Starting OpenDaylight"
+    ${CCSDK_HOME}/bin/installOdlHostKey.sh
+    ${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 +59,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
-${ODL_HOME}/bin/client
+exec ${ODL_HOME}/bin/karaf