Feature 11061: Clean MON to have only the dashboarder

Change-Id: Ic5a4bc9689a7220ba7d1376159123c97c301faaf
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index acb7f6b..d37ce74 100644 (file)
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -137,4 +137,4 @@ EXPOSE 8000
 HEALTHCHECK --start-period=120s --interval=5s --timeout=2s --retries=12\
   CMD osm-mon-healthcheck || exit 1
 
-CMD /bin/bash scripts/start.sh
+CMD /bin/bash scripts/dashboarder-start.sh

diff --git a/docker/MON/scripts/start.sh b/docker/MON/scripts/start.sh
deleted file mode 100644 (file)
index 5950194..0000000
--- a/docker/MON/scripts/start.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright 2018 Whitestack, LLC
-# *************************************************************
-
-# 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: glavado@whitestack.com
-##
-
-osm-mon-server &
-osm-mon-evaluator &
-osm-mon-collector &
-osm-mon-dashboarder

diff --git a/installers/helm/osm/templates/mon/mon-deployment.yaml b/installers/helm/osm/templates/mon/mon-deployment.yaml
index 9ec3634..a005d38 100644 (file)
--- a/installers/helm/osm/templates/mon/mon-deployment.yaml
+++ b/installers/helm/osm/templates/mon/mon-deployment.yaml
@@ -57,8 +57,6 @@ spec:
             {{- toYaml .Values.global.securityContext | nindent 12 }}
           image: {{ include "osm.mon.image" . }}
           imagePullPolicy: {{ .Values.global.image.pullPolicy }}
-          command: ["/bin/bash"]
-          args: ["scripts/dashboarder-start.sh"]
           ports:
             - containerPort: 8662
               protocol: TCP