Change odl restart method

[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 9330f96..90bb3f2 100644 (file)
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -108,13 +108,30 @@ then
        echo "cadi_prop_files=${APPC_HOME}/data/properties/cadi.properties" >> ${ODL_HOME}/etc/system.properties
        echo "" >> ${ODL_HOME}/etc/system.properties
        
-       echo "Copying a working version of the shiro configuration into the opendaylight etc folder"
-       cp ${APPC_HOME}/data/shiro.ini ${ODL_HOME}/etc/shiro.ini
+       echo "Copying the aaa shiro configuration into opendaylight"
+    cp ${APPC_HOME}/data/aaa-app-config.xml ${ODL_HOME}/etc/opendaylight/datastore/initial/config/aaa-app-config.xml
 
     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