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
b37e381
..
3a879ad
100644
(file)
--- a/
installers/docker/docker-compose.yaml
+++ b/
installers/docker/docker-compose.yaml
@@
-6,7
+6,6
@@
volumes:
mon_db:
pol_db:
osm_packages:
mon_db:
pol_db:
osm_packages:
- keystone_db:
prom_db:
networks:
netOSM:
prom_db:
networks:
netOSM:
@@
-59,22
+58,12
@@
services:
- prom_db:/prometheus
networks:
- netOSM
- prom_db:/prometheus
networks:
- netOSM
- keystone-db:
- image: mariadb:10
- networks:
- - netOSM
- volumes:
- - keystone_db:/var/lib/mysql
- env_file:
- - ./keystone-db.env
-# ports:
-# - "3306:3306"
keystone:
image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-latest}
networks:
- netOSM
environment:
keystone:
image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-latest}
networks:
- netOSM
environment:
- DB_HOST:
keystone-db
+ DB_HOST:
mysql
env_file:
- ./keystone.env
ports:
env_file:
- ./keystone.env
ports:
@@
-111,10
+100,12
@@
services:
# - kafka
# - mongo
# - ro
# - kafka
# - mongo
# - ro
-
ro-db
:
+
mysql
:
image: mysql:5
networks:
image: mysql:5
networks:
- - netOSM
+ netOSM:
+ aliases:
+ - ro-db
volumes:
- ro_db:/var/lib/mysql
env_file:
volumes:
- ro_db:/var/lib/mysql
env_file:
@@
-126,11
+117,11
@@
services:
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:
volumes:
- ro:/var/log/osm
ports:
@@
-142,8
+133,8
@@
services:
volumes:
- mon_db:/app/database
environment:
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
env_file:
- ./mon.env
ports:
env_file:
- ./mon.env
ports:
@@
-158,7
+149,8
@@
services:
- pol_db:/app/database
environment:
OSMPOL_SQL_DATABASE_URI: sqlite:///app/database/policy_module.db
- 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
#depends_on:
# - kafka
# - mon