From: Dan Timoney <dt5972@att.com>
Date: Mon, 12 Mar 2018 20:36:18 +0000 (+0000)
Subject: Merge "Fix odlsli restart issue"
X-Git-Tag: v0.2.1~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=fdde4d4c361607ea316af5c1967c75f1044cf3e8;hp=9898d55e8bb0b6bdb0ec6f2826273439ddbeaf5a

Merge "Fix odlsli restart issue"
---

diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index 70341af9..75f51b35 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.
@@ -30,6 +30,12 @@ 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
 #
@@ -43,26 +49,19 @@ 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 "Installing SDN-C database"
+    ${CCSDK_HOME}/bin/installSdncDb.sh
 
+    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 "Installed at `date`" > ${CCSDK_HOME}/.installed
 fi
 
-exec ${ODL_HOME}/bin/karaf server
+# Start client to force a wait on state of karaf server
+${ODL_HOME}/bin/client
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index d7cc1ed3..04916a52 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -16,7 +16,6 @@
     <description>Creates OpenDaylight container</description>
 
     <modules>
-    	    <module>carbon</module>
     	    <module>nitrogen</module>
     </modules>
 </project>