From: Juan <jquiroga@whitestack.com>
Date: Fri, 16 Nov 2018 14:08:07 +0000 (-0300)
Subject: removed env vars host and port from lcm, nbi
X-Git-Tag: v5.0.0~27
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=cc084d76a54f45a057402150b8c388ea96d576e9;p=osm%2Fdevops.git

removed env vars host and port from lcm, nbi

Change-Id: Id2a0460fc35b036471caa1e88fecf76c3b565c57
Signed-off-by: Juan <jquiroga@whitestack.com>
---

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 1a750d3b..909ea3a2 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -84,8 +84,11 @@ ENV OSMLCM_VCA_SECRET:     secret
 
 # database
 ENV OSMLCM_DATABASE_DRIVER mongo
-ENV OSMLCM_DATABASE_HOST   mongo
-ENV OSMLCM_DATABASE_PORT   27017
+ENV OSMLCM_DATABASE_URI    mongodb://mongo:27017
+#ENV OSMLCM_DATABASE_HOST    mongo
+#ENV OSMLCM_DATABASE_PORT    27017
+
+
 ENV OSMLCM_STORAGE_DRIVER  local
 ENV OSMLCM_STORAGE_PATH    /app/storage
 
diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 6a42717b..ae93274b 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -46,7 +46,7 @@ RUN apt-get --yes update  && apt-get -y install python3-osm-common${COMMON_VERSI
 COPY scripts/ scripts/
 
 ENV BROKER_URI kafka:9092
-ENV MONGO_URI mongo:27017
+ENV MONGO_URI mongodb://mongo:27017
 ENV DATABASE sqlite:///mon_sqlite.db
 ENV OS_NOTIFIER_URI localhost:8662
 ENV OS_DEFAULT_GRANULARITY 300
diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index d2d0c361..04a9acd9 100644
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -51,8 +51,10 @@ ENV OSMNBI_SOCKET_PORT     9999
 ENV OSMNBI_STORAGE_PATH    /app/storage
 # database
 ENV OSMNBI_DATABASE_DRIVER mongo
-ENV OSMNBI_DATABASE_HOST   mongo
-ENV OSMNBI_DATABASE_PORT   27017
+ENV OSMNBI_DATABASE_URI   mongodb://mongo:27017
+#ENV OSMNBI_DATABASE_HOST   mongo
+#ENV OSMNBI_DATABASE_PORT   27017
+
 # web
 ENV OSMNBI_STATIC_DIR      /app/osm_nbi/html_public
 # logs
diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile
index f5ce0571..1eb86344 100644
--- a/docker/POL/Dockerfile
+++ b/docker/POL/Dockerfile
@@ -52,8 +52,7 @@ ENV OSMPOL_MESSAGE_HOST kafka
 ENV OSMPOL_MESSAGE_PORT 9092
 
 ENV OSMPOL_DATABASE_DRIVER mongo
-ENV OSMPOL_DATABASE_HOST mongo
-ENV OSMPOL_DATABASE_PORT 27017
+ENV OSMPOL_DATABASE_URI mongodb://mongo:27017
 
 ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db