From: Benjamin Diaz Date: Thu, 7 Feb 2019 15:09:57 +0000 (-0300) Subject: Modifies MON and POL env vars names X-Git-Tag: v6.0.0~36 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=e6f7b45be6a99a99c21ced24282163f982697357;p=osm%2Fdevops.git Modifies MON and POL env vars names Depends on 7217 Change-Id: Ibef79ce619c4d129f948dee31756ce0f7c5d6a50 Signed-off-by: Benjamin Diaz --- diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile index 6fb35cc1..c1ab2fab 100644 --- a/docker/MON/Dockerfile +++ b/docker/MON/Dockerfile @@ -50,17 +50,24 @@ 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 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 diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile index 1eb86344..8a39a858 100644 --- a/docker/POL/Dockerfile +++ b/docker/POL/Dockerfile @@ -56,6 +56,6 @@ ENV OSMPOL_DATABASE_URI mongodb://mongo:27017 ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db -ENV OSMPOL_LOG_LEVEL INFO +ENV OSMPOL_GLOBAL_LOG_LEVEL INFO CMD osm-policy-agent diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml index b37e3810..2be8fa8d 100644 --- a/installers/docker/docker-compose.yaml +++ b/installers/docker/docker-compose.yaml @@ -142,8 +142,9 @@ services: volumes: - mon_db:/app/database environment: - BROKER_URI: kafka:9092 - DATABASE: sqlite:///app/database/mon_sqlite.db + OSMMON_MESSAGE_HOST: kafka + OSMMON_MESSAGE_PORT: 9092 + OSMMON_SQL_DATABASE_URI: sqlite:///app/database/mon_sqlite.db env_file: - ./mon.env ports: @@ -158,7 +159,8 @@ services: - pol_db:/app/database environment: OSMPOL_SQL_DATABASE_URI: sqlite:///app/database/policy_module.db - BROKER_URI: kafka:9092 + OSMPOL_MESSAGE_HOST: kafka + OSMPOL_MESSAGE_PORT: 9092 #depends_on: # - kafka # - mon