diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-03-12 20:36:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-12 20:36:18 +0000 |
| commit | fdde4d4c361607ea316af5c1967c75f1044cf3e8 (patch) | |
| tree | 8da0d9606d816471edeac45c56ac349ebe6adc15 | |
| parent | 9898d55e8bb0b6bdb0ec6f2826273439ddbeaf5a (diff) | |
| parent | e2693ccbcb97d2ab5767cfde00349a9d1aa946f6 (diff) | |
Merge "Fix odlsli restart issue"
| -rw-r--r-- | odlsli/src/main/scripts/startODL.sh | 39 | ||||
| -rw-r--r-- | opendaylight/pom.xml | 1 |
2 files changed, 19 insertions, 21 deletions
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> |