X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;fp=odlsli%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;h=8c45dda5d3710964a9f289ba1d8fb16bd199ff6f;hp=6b42937c0801a68975ee66ab1be55ff203d6db1c;hb=e14a02086c9119532f9153c78346d5c1d6789ca9;hpb=6f0c0101dcb421c75a1a49bea02d1dc7479ef7d1

diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index 6b42937c..8c45dda5 100644
--- a/odlsli/src/main/scripts/startODL.sh
+++ b/odlsli/src/main/scripts/startODL.sh
@@ -24,7 +24,7 @@
 
 # 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}
@@ -46,24 +46,14 @@ 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
+    # 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 "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
 
-exec ${ODL_HOME}/bin/karaf
+exec ${ODL_HOME}/bin/karaf server