Exposing MON port 8662 back

Change-Id: I32808384b57207a3913c5fbae29fe93d6b9c45f5
Signed-off-by: lavado <glavado@whitestack.com>

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index f4c014e..c0ca27d 100644 (file)
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -131,10 +131,10 @@ services:
       DATABASE: sqlite:///app/database/mon_sqlite.db
     env_file:
       - ./mon.env
       DATABASE: sqlite:///app/database/mon_sqlite.db
     env_file:
       - ./mon.env

+    ports:
+      - "${OSM_MON_PORTS:-8662:8662}"

     #depends_on:
     #  - kafka
     #depends_on:
     #  - kafka

-    ports:
-      - "8662"

   pol:
     image: ${DOCKER_USER:-osm}/pol:${TAG:-latest}
     networks:
   pol:
     image: ${DOCKER_USER:-osm}/pol:${TAG:-latest}
     networks:

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 2d03e26..cd82909 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -790,17 +790,20 @@ function deploy_lightweight() {
     OSM_RO_PORT=9090
     OSM_KEYSTONE_PORT=5000
     OSM_UI_PORT=80
     OSM_RO_PORT=9090
     OSM_KEYSTONE_PORT=5000
     OSM_UI_PORT=80

+    OSM_MON_PORT=8662

 
     if [ -n "$NO_HOST_PORTS" ]; then
         OSM_PORTS+=(OSM_NBI_PORTS=$OSM_NBI_PORT)
         OSM_PORTS+=(OSM_RO_PORTS=$OSM_RO_PORT)
         OSM_PORTS+=(OSM_KEYSTONE_PORTS=$OSM_KEYSTONE_PORT)
         OSM_PORTS+=(OSM_UI_PORTS=$OSM_UI_PORT)
 
     if [ -n "$NO_HOST_PORTS" ]; then
         OSM_PORTS+=(OSM_NBI_PORTS=$OSM_NBI_PORT)
         OSM_PORTS+=(OSM_RO_PORTS=$OSM_RO_PORT)
         OSM_PORTS+=(OSM_KEYSTONE_PORTS=$OSM_KEYSTONE_PORT)
         OSM_PORTS+=(OSM_UI_PORTS=$OSM_UI_PORT)

+        OSM_PORTS+=(OSM_MON_PORTS=$OSM_MON_PORT)

     else
         OSM_PORTS+=(OSM_NBI_PORTS=$OSM_NBI_PORT:$OSM_NBI_PORT)
         OSM_PORTS+=(OSM_RO_PORTS=$OSM_RO_PORT:$OSM_RO_PORT)
         OSM_PORTS+=(OSM_KEYSTONE_PORTS=$OSM_KEYSTONE_PORT:$OSM_KEYSTONE_PORT)
         OSM_PORTS+=(OSM_UI_PORTS=$OSM_UI_PORT:$OSM_UI_PORT)
     else
         OSM_PORTS+=(OSM_NBI_PORTS=$OSM_NBI_PORT:$OSM_NBI_PORT)
         OSM_PORTS+=(OSM_RO_PORTS=$OSM_RO_PORT:$OSM_RO_PORT)
         OSM_PORTS+=(OSM_KEYSTONE_PORTS=$OSM_KEYSTONE_PORT:$OSM_KEYSTONE_PORT)
         OSM_PORTS+=(OSM_UI_PORTS=$OSM_UI_PORT:$OSM_UI_PORT)

+        OSM_PORTS+=(OSM_MON_PORTS=$OSM_MON_PORT:$OSM_MON_PORT)

     fi
     echo "export ${OSM_PORTS[@]}" | $WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/osm_ports.sh
     echo "export OSM_NETWORK=net${OSM_STACK_NAME}" | $WORKDIR_SUDO tee --append $OSM_DOCKER_WORK_DIR/osm_ports.sh
     fi
     echo "export ${OSM_PORTS[@]}" | $WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/osm_ports.sh
     echo "export OSM_NETWORK=net${OSM_STACK_NAME}" | $WORKDIR_SUDO tee --append $OSM_DOCKER_WORK_DIR/osm_ports.sh