Add cdtproxy to docker install

[appc/deployment.git] / installation / appc / src / main / scripts / startODL.sh

diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index 46b81bd..99def7f 100644 (file)
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -91,11 +91,6 @@ then
        ${APPC_HOME}/bin/installFeatures.sh
        
        
-       if [ -x ${APPC_HOME}/svclogic/bin/install.sh ]
-       then
-               echo "Installing APPC DGs using platform-logic"
-               ${APPC_HOME}/svclogic/bin/install.sh
-       fi
 
        if [ -x ${APPC_HOME}/svclogic/bin/install-converted-dgs.sh ]
        then
@@ -113,12 +108,32 @@ 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
 
        appcInstallEndTime=$(date +%s)
        echo "Total Appc install took $(expr $appcInstallEndTime - $appcInstallStartTime) seconds"
 
+echo "Starting cdt-proxy-service jar, logging to ${APPC_HOME}/cdt-proxy-service/jar.log"
+java -jar ${APPC_HOME}/cdt-proxy-service/cdt-proxy-service.jar > ${APPC_HOME}/cdt-proxy-service/jar.log &
+
 exec ${ODL_HOME}/bin/karaf