X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;h=8c45dda5d3710964a9f289ba1d8fb16bd199ff6f;hb=refs%2Fchanges%2F93%2F55293%2F1;hp=70341af9639d377c2b43bf3300a9a6515062ed53;hpb=9898d55e8bb0b6bdb0ec6f2826273439ddbeaf5a;p=ccsdk%2Fdistribution.git

diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index 70341af9..8c45dda5 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,12 +24,13 @@
 
 # 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}
 
+
 #
 # Wait for database
 #
@@ -43,26 +44,16 @@ echo -e "\nmysql ready"
 
 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 ]
-	then
-		echo "Installing directed graphs"
-		${CCSDK_HOME}/svclogic/bin/install.sh
-	fi
-
-
-	echo "Restarting OpenDaylight"
-	${ODL_HOME}/bin/stop
-	echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to stop"
-	sleep ${SLEEP_TIME}
-	echo "Installed at `date`" > ${CCSDK_HOME}/.installed
+    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`" > ${CCSDK_HOME}/.installed
 fi
 
 exec ${ODL_HOME}/bin/karaf server