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 fc1599a..90bb3f2 100644 (file)
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -27,11 +27,13 @@
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
+SDNC_HOME=${SDNC_HOME:-/opt/onap/ccsdk}
 APPC_HOME=${APPC_HOME:-/opt/onap/appc}
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
 
+appcInstallStartTime=$(date +%s)
+
 #
 # Adding the DMAAP_TOPIC_ENV variable into APPC-ASDC-LISTENER properties
 #
@@ -67,17 +69,16 @@ then
        ${SDNC_HOME}/bin/installSdncDb.sh
        echo "Installing APPC database"
        ${APPC_HOME}/bin/installAppcDb.sh
+       echo "Installing ODL Host Key"
+       ${SDNC_HOME}/bin/installOdlHostKey.sh
        echo "Starting OpenDaylight"
        ${ODL_HOME}/bin/start
        echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
        sleep ${SLEEP_TIME}
-       echo "Inserting modified installFeatures.sh for sdnc"
-       rm ${SDNC_HOME}/bin/installFeatures.sh
-       cp ${APPC_HOME}/data/sdncInstallFeatures.sh ${SDNC_HOME}/bin/installFeatures.sh
        echo "Copying a working version of the logging configuration into the opendaylight etc folder"
        cp ${APPC_HOME}/data/org.ops4j.pax.logging.cfg ${ODL_HOME}/etc/org.ops4j.pax.logging.cfg
        echo "Copying a new version of aaf cadi shiro into the opendaylight deploy folder"
-       cp ${APPC_HOME}/data/aaf-cadi-shiro.jar ${ODL_HOME}/deploy/aaf-cadi-shiro.jar
+       cp ${APPC_HOME}/data/aaf-shiro-aafrealm-osgi-bundle.jar ${ODL_HOME}/deploy/aaf-shiro-aafrealm-osgi-bundle.jar
        echo "Installing SDNC platform features"
        ${SDNC_HOME}/bin/installFeatures.sh
        if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
@@ -88,6 +89,8 @@ then
        
        echo "Installing APPC platform features"
        ${APPC_HOME}/bin/installFeatures.sh
+       
+       
        if [ -x ${APPC_HOME}/svclogic/bin/install.sh ]
        then
                echo "Installing APPC DGs using platform-logic"
@@ -105,12 +108,34 @@ 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 "Restarting OpenDaylight"
+    ${ODL_HOME}/bin/stop
+       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"
+
 exec ${ODL_HOME}/bin/karaf