diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-03-19 17:21:32 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-03-19 17:44:08 -0400 |
| commit | 329beee90ede1bea60031dbf9be56dce5faa4f62 (patch) | |
| tree | 5907a1e7f6ad107e91c178283c0f290ff5de4d28 /odlsli/src/main/scripts/startODL.sh | |
| parent | 9f00773e13201563cc4cbb4165744299b825317c (diff) | |
Fix ODL restart issue
Found root cause of ODL restart issue had to do with order
of installation of base ODL features. Fixed startup order and
removed workaround in startODL.sh
Change-Id: Id4b4f96242b981fba336b9e0a4de0439d2a93115
Issue-ID: CCSDK-208
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'odlsli/src/main/scripts/startODL.sh')
| -rw-r--r-- | odlsli/src/main/scripts/startODL.sh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh index 3e528216..568e179a 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,9 +58,9 @@ then ${CCSDK_HOME}/svclogic/bin/install.sh fi + echo "Restarting OpenDaylight" + ${ODL_HOME}/bin/stop echo "Installed at `date`" > ${CCSDK_HOME}/.installed fi -# Wait on java -pid=$(ps auxwww | grep java | grep -v grep | awk '{print $2}') -exec tail --pid=$pid -f /dev/null +exec ${ODL_HOME}/bin/karaf |