diff options
author | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-22 17:05:16 -0400 |
---|---|---|
committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-22 17:05:16 -0400 |
commit | e14a02086c9119532f9153c78346d5c1d6789ca9 (patch) | |
tree | 05b612b7b008fc947dc2a11e315df70b1d045afd /odlsli/src/main/scripts/startODL.sh | |
parent | 6f0c0101dcb421c75a1a49bea02d1dc7479ef7d1 (diff) |
Improve odlsli startup time
Improved odlsli startup time by moving feature installation to build
time, using ansible-opendaylight.
Change-Id: I3f846da70e9aa0b8ce818ff83811c1b52aef1436
Issue-ID: CCSDK-285
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'odlsli/src/main/scripts/startODL.sh')
-rw-r--r-- | odlsli/src/main/scripts/startODL.sh | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh index 6b42937c..8c45dda5 100644 --- a/odlsli/src/main/scripts/startODL.sh +++ b/odlsli/src/main/scripts/startODL.sh @@ -24,7 +24,7 @@ # Install SDN-C platform components if not already installed and start container -ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} +ODL_HOME=${ODL_HOME:-/opt/opendaylight} ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} SLEEP_TIME=${SLEEP_TIME:-120} @@ -46,24 +46,14 @@ if [ ! -f ${CCSDK_HOME}/.installed ] then echo "Installing SDN-C database" ${CCSDK_HOME}/bin/installSdncDb.sh - echo "Starting OpenDaylight" - ${CCSDK_HOME}/bin/installOdlHostKey.sh - ${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 + # echo "Installing OpenDaylight host key" + # ${CCSDK_HOME}/bin/installOdlHostKey.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 60 seconds for OpenDaylight stop to complete" - sleep 60 echo "Installed at `date`" > ${CCSDK_HOME}/.installed fi -exec ${ODL_HOME}/bin/karaf +exec ${ODL_HOME}/bin/karaf server |