bug 801 increase healthcheck timeout for NBI/POL/MON

Change-Id: I36a4b5ec36367ed3863dae2193e598a7f276322e
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
(cherry picked from commit 836e9dba53858f01e494d55fff9ef7e6849e16c5)

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 2fb0800..71b6bbb 100644 (file)
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -82,7 +82,7 @@ ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
 
 EXPOSE 8000
 
-HEALTHCHECK --interval=5s --timeout=2s --retries=12 \
+HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
   CMD osm-mon-healthcheck || exit 1
 
 CMD /bin/bash scripts/start.sh

diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index 87fa0ac..9a6d6ea 100644 (file)
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -1,3 +1,24 @@
+# Copyright 2018 ETSI
+# *************************************************************
+
+# This file is part of OSM Monitoring module
+# All Rights Reserved to Whitestack, LLC
+
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+
+#         http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact: bdiaz@whitestack.com or glavado@whitestack.com
+##
 # This creates osm/NBI docker from local NBI source code
 
 FROM ubuntu:16.04
@@ -81,7 +102,7 @@ ENV OSMNBI_AUTHENTICATION_BACKEND               internal
 ENV OSMNBI_PROMETHEUS_HOST                      prometheus
 ENV OSMNBI_PROMETHEUS_PORT                      9090
 
-HEALTHCHECK --interval=5s --timeout=2s --retries=12 \
+HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
   CMD curl -k https://localhost:9999/osm/ | grep Welcome || exit 1
 
 # Run app.py when the container launches

diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile
index 6de7c71..2dd1382 100644 (file)
--- a/docker/POL/Dockerfile
+++ b/docker/POL/Dockerfile
@@ -55,7 +55,7 @@ ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db
 
 ENV OSMPOL_GLOBAL_LOG_LEVEL INFO
 
-HEALTHCHECK --interval=5s --timeout=2s --retries=12 \
+HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
   CMD osm-pol-healthcheck || exit 1
 
 CMD /bin/bash scripts/start.sh