diff options
| -rw-r--r-- | kubernetes/appc/charts/appc-cdt/values.yaml | 2 | ||||
| -rwxr-xr-x | kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh | 22 | ||||
| -rw-r--r-- | kubernetes/appc/values.yaml | 2 |
3 files changed, 20 insertions, 6 deletions
diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml index 13dcc1c75b..7db9527a7f 100644 --- a/kubernetes/appc/charts/appc-cdt/values.yaml +++ b/kubernetes/appc/charts/appc-cdt/values.yaml @@ -26,7 +26,7 @@ flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/appc-cdt-image:1.5.2 +image: onap/appc-cdt-image:1.5.3 pullPolicy: Always # application configuration 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 diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index 4998b2ec5a..a19b67d802 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -31,7 +31,7 @@ global: flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/appc-image:1.5.2 +image: onap/appc-image:1.5.3 pullPolicy: Always # flag to enable debugging - application support required |