X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fosm_health.sh;h=e26e762c5fc8f3fe014cc826338c94ad1fc9c7a6;hb=b208a17ccfeeba27532c9f17e21bcc31676b7d56;hp=a8c338ddd97cc1fb33db94e47718bd8cf8e60e2e;hpb=69b532b05f993931ce73b997de85123a7da09d35;p=osm%2Fdevops.git

diff --git a/installers/osm_health.sh b/installers/osm_health.sh
index a8c338dd..e26e762c 100755
--- a/installers/osm_health.sh
+++ b/installers/osm_health.sh
@@ -16,11 +16,9 @@
 # limitations under the License.
 
 WAIT_TIME=340  # LCM healthcheck needs 2x(30+140) senconds
-#SERVICES_WITH_HEALTH="nbi ro zookeeper lcm mon light-ui pol kafka"
 SERVICES_WITH_HEALTH="nbi ro zookeeper lcm mon pol kafka"
 NUM_SERVICES_WITH_HEALTH=$(echo $SERVICES_WITH_HEALTH | wc -w)
 WAIT_FINAL=30
-#OSM_DEPLOYMENT="light-ui nbi lcm ro mon pol keystone"
 OSM_DEPLOYMENT="nbi lcm ro mon pol keystone"
 OSM_STATEFULSET="zookeeper kafka mongo mysql prometheus"
 NUM_K8S_PODS=$(echo $OSM_DEPLOYMENT $OSM_STATEFULSET | wc -w)
@@ -56,7 +54,7 @@ while [ $time -le "$WAIT_TIME" ]; do
             exit 0
         fi
     else
-        if [ "$(docker ps | grep " ${STACK_NAME}_" | grep -i healthy | wc -l)" -ge "$NUM_SERVICES_WITH_HEALTH" ]; then
+        if [ "$(sg docker -c "docker ps" | grep " ${STACK_NAME}_" | grep -i healthy | wc -l)" -ge "$NUM_SERVICES_WITH_HEALTH" ]; then
             # all dockers are healthy now.
             # final sleep is needed until more health checks are added to validate system is ready to handle requests
             sleep $WAIT_FINAL
@@ -81,12 +79,12 @@ if [ -n "$KUBERNETES" ]; then
     done
 else
     echo "Not all Docker services are healthy"
-    docker ps | grep " ${STACK_NAME}_"
+    sg docker -c "docker ps" | grep " ${STACK_NAME}_"
     for S_WITH_HEALTH in $SERVICES_WITH_HEALTH ; do
-        docker ps | grep " ${STACK_NAME}_" | grep -i healthy | grep -q "_${S_WITH_HEALTH}."  && continue
+        sg docker -c "docker ps" | grep " ${STACK_NAME}_" | grep -i healthy | grep -q "_${S_WITH_HEALTH}."  && continue
         echo
         echo BEGIN LOGS of container ${S_WITH_HEALTH} not healthy
-        docker service logs ${STACK_NAME}_${S_WITH_HEALTH} 2>&1 | tail -n 100
+        sg docker -c "docker service logs ${STACK_NAME}_${S_WITH_HEALTH} 2>&1" | tail -n 100
         echo END LOGS of container ${S_WITH_HEALTH} not healthy
         echo
     done