diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-07-24 10:10:08 -0400 |
|---|---|---|
| committer |   jmac <james.macnider@amdocs.com> | 2018-07-25 20:16:55 +0000 |
| commit | 1bb05c88955b5e0ad6406041ae0aaa2ef6021346 (patch) | |
| tree | 1d80c8e8f0dfd9be109bde9ba6e67ab7d645c812 /kubernetes/sdnc/resources | |
| parent | 309a53b8f7bb6ba9f3c886ce2bd82233fe9acab4 (diff) | |
Remove ODL restart from start script
Update image versions to 1.4-STAGING-latest
Update startODL.sh script to eliminate restart of ODL container
Change-Id: Iaef4aaea243974f97060b73c81dedce990108180
Issue-ID: SDNC-394
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'kubernetes/sdnc/resources')
| -rwxr-xr-x | kubernetes/sdnc/resources/config/bin/startODL.sh | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh index 86f45d3fbd..6383853c32 100755 --- a/kubernetes/sdnc/resources/config/bin/startODL.sh +++ b/kubernetes/sdnc/resources/config/bin/startODL.sh @@ -27,8 +27,9 @@ function enable_odl_cluster(){ fi echo "Installing Opendaylight cluster features" - ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering - ${ODL_HOME}/bin/client feature:install odl-jolokia + cat $ODL_HOME/etc/org.apache.karaf.features.cfg | sed -e "\|featuresBoot=config|s|$|,odl-mdsal-clustering,odl-jolokia|" > $ODL_HOME/etc/org.apache.karaf.features.cfg + #${ODL_HOME}/bin/client feature:install odl-mdsal-clustering + #${ODL_HOME}/bin/client feature:install odl-jolokia echo "Update cluster information statically" hm=$(hostname) @@ -102,13 +103,10 @@ then ${SDNC_HOME}/bin/installSdncDb.sh echo "Installing SDN-C keyStore" ${SDNC_HOME}/bin/addSdncKeyStore.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" - ${SDNC_HOME}/bin/installFeatures.sh + + # No longer needed (this was a workaround for bug in Nitrogen) + #${CCSDK_HOME}/bin/installOdlHostKey.sh + if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ] then echo "Installing directed graphs" @@ -117,12 +115,6 @@ then if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi - 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 |