projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modifies MON deployment to use mysql database
[osm/devops.git]
/
installers
/
docker
/
docker-compose.yaml
diff --git
a/installers/docker/docker-compose.yaml
b/installers/docker/docker-compose.yaml
index
0b24db2
..
3a879ad
100644
(file)
--- a/
installers/docker/docker-compose.yaml
+++ b/
installers/docker/docker-compose.yaml
@@
-1,23
+1,35
@@
version: '3'
volumes:
version: '3'
volumes:
- OSMstorage:
+ ro:
+ ro_db:
+ mongo_db:
+ mon_db:
+ pol_db:
+ osm_packages:
+ prom_db:
networks:
netOSM:
networks:
netOSM:
- external: true
+ external:
+ name: ${OSM_NETWORK:-netosm}
#driver: overlay
#driver_opts:
# com.docker.network.driver.mtu: "1446"
services:
zookeeper:
#driver: overlay
#driver_opts:
# com.docker.network.driver.mtu: "1446"
services:
zookeeper:
- image: wurstmeister/zookeeper
- ports:
- - "2181:2181"
+ image: wurstmeister/zookeeper
:${ZOOKEEPER_TAG:-latest}
+
#
ports:
+
#
- "2181:2181"
networks:
- netOSM
networks:
- netOSM
+ healthcheck:
+ test: echo stat | nc localhost 2181
+ interval: 10s
+ timeout: 10s
+ retries: 3
kafka:
kafka:
- image: wurstmeister/kafka
+ image: wurstmeister/kafka
:${KAFKA_TAG:-latest}
ports:
ports:
- - "9092
:9092
"
+ - "9092"
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-30,30
+42,54
@@
services:
# - zookeeper
mongo:
image: mongo
# - zookeeper
mongo:
image: mongo
+# ports:
+# - "27017:27017"
+ networks:
+ - netOSM
+ volumes:
+ - mongo_db:/data/db
+ prometheus:
+ image: prom/prometheus:${PROMETHEUS_TAG:-latest}
+ hostname: prometheus
ports:
ports:
- - "27017:27017"
+ - "${OSM_PROM_PORTS:-9091:9090}"
+ volumes:
+ - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+ - prom_db:/prometheus
networks:
- netOSM
networks:
- netOSM
+ keystone:
+ image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-latest}
+ networks:
+ - netOSM
+ environment:
+ DB_HOST: mysql
+ env_file:
+ - ./keystone.env
+ ports:
+ - "${OSM_KEYSTONE_PORTS:-5000:5000}"
nbi:
nbi:
- image:
osm/nbi
+ image:
${DOCKER_USER:-opensourcemano}/nbi:${TAG:-latest}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
- -
OSMstorage
:/app/storage
+ -
osm_packages
:/app/storage
environment:
OSMNBI_DATABASE_HOST: mongo
OSMNBI_MESSAGE_HOST: kafka
environment:
OSMNBI_DATABASE_HOST: mongo
OSMNBI_MESSAGE_HOST: kafka
+ env_file:
+ - ./nbi.env
ports:
ports:
- - "
9999:9999
"
+ - "
${OSM_NBI_PORTS:-9999:9999}
"
#depends_on:
# - kafka
# - mongo
lcm:
#depends_on:
# - kafka
# - mongo
lcm:
- image:
osm/lcm
+ image:
${DOCKER_USER:-opensourcemano}/lcm:${TAG:-latest}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
- -
OSMstorage
:/app/storage
+ -
osm_packages
:/app/storage
environment:
OSMLCM_RO_HOST: ro
OSMLCM_DATABASE_HOST: mongo
environment:
OSMLCM_RO_HOST: ro
OSMLCM_DATABASE_HOST: mongo
@@
-64,47
+100,62
@@
services:
# - kafka
# - mongo
# - ro
# - kafka
# - mongo
# - ro
-
ro-db
:
- image: mysql
+
mysql
:
+ image: mysql
:5
networks:
networks:
- - netOSM
+ netOSM:
+ aliases:
+ - ro-db
+ volumes:
+ - ro_db:/var/lib/mysql
env_file:
- ./ro-db.env
env_file:
- ./ro-db.env
- ports:
- - "3306:3306"
+
#
ports:
+
#
- "3306:3306"
ro:
ro:
- image:
osm/ro
+ image:
${DOCKER_USER:-opensourcemano}/ro:${TAG:-latest}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
- RO_DB_HOST:
ro-db
+ RO_DB_HOST:
mysql
env_file:
- ./ro.env
#depends_on:
env_file:
- ./ro.env
#depends_on:
- # - ro-db
+ # - mysql
+ volumes:
+ - ro:/var/log/osm
ports:
ports:
- - "
9090:9090
"
+ - "
${OSM_RO_PORTS:-9090:9090}
"
mon:
mon:
- image:
osm/mon
+ image:
${DOCKER_USER:-opensourcemano}/mon:${TAG:-latest}
networks:
- netOSM
networks:
- netOSM
+ volumes:
+ - mon_db:/app/database
environment:
environment:
- BROKER_URI: kafka:9092
+ OSMMON_MESSAGE_HOST: kafka
+ OSMMON_MESSAGE_PORT: 9092
+ env_file:
+ - ./mon.env
+ ports:
+ - "${OSM_MON_PORTS:-8662:8662}"
#depends_on:
# - kafka
#depends_on:
# - kafka
- ports:
- - "8662:8662"
- pm:
- image: osm/pm
+ pol:
+ image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-latest}
networks:
- netOSM
networks:
- netOSM
+ volumes:
+ - pol_db:/app/database
environment:
environment:
- BROKER_URI: kafka:9092
+ OSMPOL_SQL_DATABASE_URI: sqlite:///app/database/policy_module.db
+ OSMPOL_MESSAGE_HOST: kafka
+ OSMPOL_MESSAGE_PORT: 9092
#depends_on:
# - kafka
# - mon
light-ui:
#depends_on:
# - kafka
# - mon
light-ui:
- image:
osm/light-ui
+ image:
${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-latest}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-112,5
+163,4
@@
services:
#depends_on:
# - nbi
ports:
#depends_on:
# - nbi
ports:
- - "80:80"
-
+ - "${OSM_UI_PORTS:-80:80}"