diff options
Diffstat (limited to 'installation/appc/src/main/scripts/startODL.sh')
| -rw-r--r-- | installation/appc/src/main/scripts/startODL.sh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh index fc1599a..e38b317 100644 --- 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 # @@ -71,9 +73,6 @@ then ${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" @@ -88,6 +87,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" @@ -108,9 +109,14 @@ then 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 "Restarting OpenDaylight" - ${ODL_HOME}/bin/stop + echo "Restarting OpenDaylight" + ${ODL_HOME}/bin/stop + echo "Waiting 60 seconds for OpenDaylight stop to complete" + sleep 60 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 |