From: Patrick Brady <pb071s@att.com>
Date: Thu, 26 Apr 2018 17:59:45 +0000 (-0700)
Subject: Change odl restart method
X-Git-Tag: v1.3.0~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=01e568d1057eeaa952fad7ea8534baf59ca5990c;p=appc%2Fdeployment.git

Change odl restart method

Adding a script to wait for karaf to stop before
trying to restart, replacing the simple timer that
was there before.

This should allow restart even with a disconnected
event-listener running

Change-Id: Ie0a2affebdf80f1919d40cbb6a0c4df3894b578d
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-866
---

diff --git a/installation/appc/src/main/scripts/installFeatures.sh b/installation/appc/src/main/scripts/installFeatures.sh
index 569b5d1..152b751 100644
--- a/installation/appc/src/main/scripts/installFeatures.sh
+++ b/installation/appc/src/main/scripts/installFeatures.sh
@@ -84,7 +84,8 @@ APPC_FEATURES_1=" \
  appc-config-flow-controller \
  appc-config-params \
  appc-artifact-handler \
- appc-aai-client"
+ appc-aai-client \
+ appc-event-listener"
  
  APPC_FEATURES_UNZIP=" \
  appc-metric \
diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index 46b81bd..90bb3f2 100644
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -113,8 +113,25 @@ then
 
     echo "Restarting OpenDaylight"
     ${ODL_HOME}/bin/stop
-    echo "Waiting 60 seconds for OpenDaylight stop to complete"
-    sleep 60
+	checkRun () {
+		running=0
+		while read a b c d e f g h
+		do
+		if [ "$h" == "/bin/sh /opt/opendaylight/current/bin/karaf server" ]
+		then
+			running=1
+		fi
+		done < <(ps -eaf)
+		echo $running
+	}
+	
+	while [ $( checkRun ) == 1 ]
+	do
+		echo "Karaf is still running, waiting..."
+		sleep 5s
+	done
+	echo "Karaf process has stopped"
+	sleep 10s
 	echo "Installed at `date`" > ${SDNC_HOME}/.installed
 fi