Remove redundant so-monitoring startup

 - so-monitoring-image has no effect on CSITs and
   its build has been removed from so repository

Issue-ID: SO-3633, SO-3487
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: Iacb62d0a362fe2d4297b893c215d73320d6ca510

diff --git a/plans/so/macroflow/docker-compose.local.yml b/plans/so/macroflow/docker-compose.local.yml
index 281a516..a796b37 100644 (file)
--- a/plans/so/macroflow/docker-compose.local.yml
+++ b/plans/so/macroflow/docker-compose.local.yml
@@ -25,6 +25,3 @@ services:
   api-handler-infra:
     image: onap/so/api-handler-infra:${TAG}
 #############################################################################
-  so-monitoring:
-    image: onap/so/so-monitoring:${TAG}
-################################################################################

diff --git a/plans/so/macroflow/docker-compose.yml b/plans/so/macroflow/docker-compose.yml
index 8cc1c7b..5b6bfb2 100644 (file)
--- a/plans/so/macroflow/docker-compose.yml
+++ b/plans/so/macroflow/docker-compose.yml
@@ -227,22 +227,6 @@ services:
     user: root
     entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 #############################################################################
-  so-monitoring:
-    image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-monitoring:${TAG}
-    ports:
-      - "30224:30224"
-    volumes:
-      - ${CONFIG_DIR_PATH_MACRO}/override-files/so-monitoring/onapheat:/app/config
-    environment:
-      - APP=so-monitoring
-      - JVM_ARGS=-Xms64m -Xmx512m
-    hostname:
-      so-monitoring.so.testlab.onap.org
-    depends_on:
-      - mariadb
-      - catalog-db-adapter
-      - request-db-adapter
-################################################################################
   sdc-simulator:
     image: simulators/sdc-simulator:latest
     ports: