From 48de734771b5c9a39ffaef393c9cfaeaeb3b9c08 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Wed, 19 Jun 2019 12:12:33 -0700 Subject: Revert "Fix for appc clustering install failure" It is reported that the old version of this script is currently working, so we will leave it as is for now and make changes later. This reverts commit 616fb1cea6cadc5e368f43176eb0f4d5342b87b7. Change-Id: I38d8bff135fbcc3eb407d2f3fcf295cf58c386d2 Signed-off-by: Patrick Brady Issue-ID: APPC-1242 --- .../config/appc/opt/onap/appc/bin/startODL.sh | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh index 64cf3d9a72..ed35de8f77 100755 --- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh +++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh @@ -133,6 +133,7 @@ then if $ENABLE_ODL_CLUSTER then echo "Installing Opendaylight cluster features" + ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering enable_odl_cluster fi @@ -145,11 +146,24 @@ then fi echo "Restarting OpenDaylight" - echo "Stopping OpenDaylight and waiting for it to stop" ${ODL_HOME}/bin/stop - #The karaf command will exit when odl shuts down. This is the most reliable way to wait for opendaylight to stop - #before exiting the docker container. - ${ODL_HOME}/bin/karaf + checkRun () { + running=0 + while read a b c d e f g h + do + if [ "$h" == "/bin/sh /opt/opendaylight/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 -- cgit 1.2.3-korg