Fix ODL restart issue 35/36835/2
authorTimoney, Dan (dt5972) <dt5972@att.com>
Mon, 19 Mar 2018 21:21:32 +0000 (17:21 -0400)
committerTimoney, Dan (dt5972) <dt5972@att.com>
Mon, 19 Mar 2018 21:44:08 +0000 (17:44 -0400)
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>
odlsli/src/main/scripts/installCcsdkFeatures.sh
odlsli/src/main/scripts/startODL.sh

index 1ae108b..4ee03e3 100644 (file)
@@ -55,11 +55,14 @@ CCSDK_NORTHBOUND_VERSION=${CCSDK_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT}
 CCSDK_PLUGINS_VERSION=${CCSDK_PLUGINS_VERSION:-0.0.1-SNAPSHOT}
 
 echo "Enabling core features"
-${ODL_HOME}/bin/client feature:install odl-mdsal-all
-${ODL_HOME}/bin/client feature:install odl-mdsal-apidocs
-${ODL_HOME}/bin/client feature:install odl-restconf-all
-
-
+${ODL_HOME}/bin/client feature:install odl-restconf-all odl-mdsal-all odl-mdsal-apidocs
+
+# Remove etc/host.key if it exists to work around
+# issue with client authentication
+if [ -f ${ODL_HOME}/etc/host.key ]
+then
+  rm ${ODL_HOME}/etc/host.key
+fi
 
 
 echo "Installing CCSDK sli/core"
index 3e52821..568e179 100644 (file)
@@ -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

© 2017 ONAP. Copyright © The Linux Foundation ®. All Rights Reserved.
The Linux Foundation has registered trademarks and uses trademarks.
For a list of trademarks of The Linux Foundation, please see our Trademark Usage page.
Linux is a registered trademark of Linus Torvalds.
Privacy Policy and Terms of Use