diff options
| author |   Patrick Brady <patrick.brady@att.com> | 2019-06-17 10:30:08 -0700 |
|---|---|---|
| committer | Patrick Brady <patrick.brady@att.com> | 2019-06-17 19:44:38 -0700 |
| commit | 616fb1cea6cadc5e368f43176eb0f4d5342b87b7 (patch) | |
| tree | 3289ed2d09d76ecf6bd38a5ed9d0704e0951c7c3 /kubernetes/appc/resources | |
| parent | f889e6a0004b3153c8cafffc6c8489729d7d9fd3 (diff) | |
Fix for appc clustering install failure
Update appc karaf stop detection
The new stop detection script is more reliable and
does not depend on a specific value and format of
the ps command.
Remove clustering feature install
The feature needs to be installed before appc features
are installed, and so the odl-mdsal-clustering install
has been moved to the build scripts.
Change-Id: I6e9c585cbd58a516114a609329422cf8375e023d
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1242
Diffstat (limited to 'kubernetes/appc/resources')
| -rwxr-xr-x | kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh | 22 |
1 files changed, 4 insertions, 18 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 ed35de8f77..64cf3d9a72 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,7 +133,6 @@ then if $ENABLE_ODL_CLUSTER then echo "Installing Opendaylight cluster features" - ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering enable_odl_cluster fi @@ -146,24 +145,11 @@ then fi echo "Restarting OpenDaylight" + echo "Stopping OpenDaylight and waiting for it to stop" ${ODL_HOME}/bin/stop - 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 + #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 echo "Karaf process has stopped" sleep 10s |