Code Review
/
ccsdk
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Install host key
[ccsdk/distribution.git]
/
odlsli
/
src
/
main
/
scripts
/
startODL.sh
diff --git
a/odlsli/src/main/scripts/startODL.sh
b/odlsli/src/main/scripts/startODL.sh
index
75f51b3
..
6b42937
100644
(file)
--- 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}
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
#
# Wait for database
@@
-51,7
+46,11
@@
if [ ! -f ${CCSDK_HOME}/.installed ]
then
echo "Installing SDN-C database"
${CCSDK_HOME}/bin/installSdncDb.sh
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 ]
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
${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
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