commit e6f7b45be6a99a99c21ced24282163f982697357
author Benjamin Diaz <bdiaz@whitestack.com> Thu Feb 07 12:09:57 2019 -0300
committer Benjamin Diaz <bdiaz@whitestack.com> Wed Feb 20 16:02:07 2019 -0300
tree 56a3e6544b752f233caed87fc20dd14cb98343cd
parent 330ebb0b5850055c6e9f993340e588198c104ce4

Modifies MON and POL env vars names

Depends on 7217

Change-Id: Ibef79ce619c4d129f948dee31756ce0f7c5d6a50
Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>

docker/MON/Dockerfile

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 6fb35cc..c1ab2fa 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -50,17 +50,24 @@
 
 COPY scripts/ scripts/
 
-ENV BROKER_URI kafka:9092
-ENV MONGO_URI mongodb://mongo:27017
-ENV DATABASE sqlite:///mon_sqlite.db
-ENV OS_NOTIFIER_URI localhost:8662
-ENV OS_DEFAULT_GRANULARITY 300
-ENV REQUEST_TIMEOUT 10
-ENV OSMMON_LOG_LEVEL INFO
-ENV OSMMON_KAFKA_LOG_LEVEL INFO
+ENV OSMMON_MESSAGE_DRIVER kafka
+ENV OSMMON_MESSAGE_HOST kafka
+ENV OSMMON_MESSAGE_PORT 9092
+
+ENV OSMMON_DATABASE_DRIVER mongo
+ENV OSMMON_DATABASE_URI mongodb://mongo:27017
+
+ENV OSMMON_SQL_DATABASE_URI sqlite:///mon_sqlite.db
+ENV OSMMON_OPENSTACK_DEFAULT_GRANULARITY 300
+ENV OSMMON_GLOBAL_REQUEST_TIMEOUT 10
+ENV OSMMON_GLOBAL_LOGLEVEL INFO
 ENV OSMMON_VCA_HOST localhost
 ENV OSMMON_VCA_SECRET secret
 ENV OSMMON_VCA_USER admin
+ENV OSMMON_DATABASE_COMMONKEY changeme
+ENV OSMMON_COLLECTOR_INTERVAL 30
+ENV OSMMON_EVALUATOR_INTERVAL 30
+ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
 
 EXPOSE 8000
 

docker/POL/Dockerfile

diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile
index 1eb8634..8a39a85 100644
--- a/docker/POL/Dockerfile
+++ b/docker/POL/Dockerfile
@@ -56,6 +56,6 @@
 
 ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db
 
-ENV OSMPOL_LOG_LEVEL INFO
+ENV OSMPOL_GLOBAL_LOG_LEVEL INFO
 
 CMD osm-policy-agent