diff options
author | Brian Freeman <bf1936@att.com> | 2019-06-22 13:08:27 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-06-22 13:08:27 +0000 |
commit | b7d6431c75a0b88fe9ed1e868cffe3b3229a8d94 (patch) | |
tree | f3dbdf1258683ff6609394d34e49b93fe671b268 | |
parent | e3418116109b26d013ab0dd23651c63e779bc036 (diff) | |
parent | 48de734771b5c9a39ffaef393c9cfaeaeb3b9c08 (diff) |
Merge "Revert "Fix for appc clustering install failure""
-rwxr-xr-x | kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh | 22 |
1 files 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 |