From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Wed, 4 Dec 2019 14:06:55 +0000 (+0100)
Subject: full_install_osm.sh: added cadvisor ports to osm_ports.sh
X-Git-Tag: v7.0.0rc1~9
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=a7b27dcb3cd9f4b79e14684957b1cd3914cda2fd;p=osm%2Fdevops.git

full_install_osm.sh: added cadvisor ports to osm_ports.sh

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

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 340cb846..b87f27b1 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -269,4 +269,4 @@ services:
     ports:
       - "${OSM_GRAFANA_PORTS:-3000:3000}"
     networks:
-      - netOSM
\ No newline at end of file
+      - netOSM
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 0bf2e200..38e50c62 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -1055,6 +1055,7 @@ function deploy_lightweight() {
     OSM_UI_PORT=80
     OSM_MON_PORT=8662
     OSM_PROM_PORT=9090
+    OSM_PROM_CADVISOR_PORT=8080
     OSM_PROM_HOSTPORT=9091
     OSM_GRAFANA_PORT=3000
     [ -n "$INSTALL_ELK" ] && OSM_ELK_PORT=5601
@@ -1067,6 +1068,7 @@ function deploy_lightweight() {
         OSM_PORTS+=(OSM_UI_PORTS=$OSM_UI_PORT)
         OSM_PORTS+=(OSM_MON_PORTS=$OSM_MON_PORT)
         OSM_PORTS+=(OSM_PROM_PORTS=$OSM_PROM_PORT)
+        OSM_PORTS+=(OSM_PROM_CADVISOR_PORTS=$OSM_PROM_CADVISOR_PORT)
         OSM_PORTS+=(OSM_GRAFANA_PORTS=$OSM_GRAFANA_PORT)
         #[ -n "$INSTALL_PERFMON" ] && OSM_PORTS+=(OSM_PM_PORTS=$OSM_PM_PORT)
         [ -n "$INSTALL_ELK" ] && OSM_PORTS+=(OSM_ELK_PORTS=$OSM_ELK_PORT)
@@ -1077,6 +1079,7 @@ function deploy_lightweight() {
         OSM_PORTS+=(OSM_UI_PORTS=$OSM_UI_PORT:$OSM_UI_PORT)
         OSM_PORTS+=(OSM_MON_PORTS=$OSM_MON_PORT:$OSM_MON_PORT)
         OSM_PORTS+=(OSM_PROM_PORTS=$OSM_PROM_HOSTPORT:$OSM_PROM_PORT)
+        OSM_PORTS+=(OSM_PROM_CADVISOR_PORTS=$OSM_PROM_CADVISOR_PORT:$OSM_PROM_CADVISOR_PORT)
         OSM_PORTS+=(OSM_GRAFANA_PORTS=$OSM_GRAFANA_PORT:$OSM_GRAFANA_PORT)
         #[ -n "$INSTALL_PERFMON" ] && OSM_PORTS+=(OSM_PM_PORTS=$OSM_PM_PORT:$OSM_PM_PORT)
         [ -n "$INSTALL_ELK" ] && OSM_PORTS+=(OSM_ELK_PORTS=$OSM_ELK_PORT:$OSM_ELK_PORT)