projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Bug 806, System test exception handled!"
[osm/devops.git]
/
installers
/
docker
/
docker-compose.yaml
diff --git
a/installers/docker/docker-compose.yaml
b/installers/docker/docker-compose.yaml
index
c0ca27d
..
621664a
100644
(file)
--- a/
installers/docker/docker-compose.yaml
+++ b/
installers/docker/docker-compose.yaml
@@
-1,10
+1,12
@@
version: '3'
volumes:
version: '3'
volumes:
+ ro:
ro_db:
mongo_db:
mon_db:
ro_db:
mongo_db:
mon_db:
+ pol_db:
osm_packages:
osm_packages:
-
keystone
_db:
+
prom
_db:
networks:
netOSM:
external:
networks:
netOSM:
external:
@@
-34,6
+36,7
@@
services:
KAFKA_ADVERTISED_HOST_NAME: kafka
KAFKA_ADVERTISED_PORT: 9092
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_ADVERTISED_HOST_NAME: kafka
KAFKA_ADVERTISED_PORT: 9092
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+ KAFKA_LOG_RETENTION_HOURS: 24
volumes:
- /var/run/docker.sock:/var/run/docker.sock
#depends_on:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
#depends_on:
@@
-46,28
+49,28
@@
services:
- netOSM
volumes:
- mongo_db:/data/db
- netOSM
volumes:
- mongo_db:/data/db
- keystone-db:
- image: mariadb:10
+ prometheus:
+ image: prom/prometheus:${PROMETHEUS_TAG:-latest}
+ hostname: prometheus
+ ports:
+ - "${OSM_PROM_PORTS:-9091:9090}"
+ volumes:
+ - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+ - prom_db:/prometheus
networks:
- netOSM
networks:
- netOSM
- volumes:
- - keystone_db:/var/lib/mysql
- env_file:
- - ./keystone-db.env
-# ports:
-# - "3306:3306"
keystone:
keystone:
- image: ${DOCKER_USER:-o
sm}/keystone:${TAG:-latest
}
+ image: ${DOCKER_USER:-o
pensourcemano}/keystone:${TAG:-6
}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
- DB_HOST:
keystone-db
+ DB_HOST:
mysql
env_file:
- ./keystone.env
ports:
- "${OSM_KEYSTONE_PORTS:-5000:5000}"
nbi:
env_file:
- ./keystone.env
ports:
- "${OSM_KEYSTONE_PORTS:-5000:5000}"
nbi:
- image: ${DOCKER_USER:-o
sm}/nbi:${TAG:-latest
}
+ image: ${DOCKER_USER:-o
pensourcemano}/nbi:${TAG:-6
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-83,7
+86,7
@@
services:
# - kafka
# - mongo
lcm:
# - kafka
# - mongo
lcm:
- image: ${DOCKER_USER:-o
sm}/lcm:${TAG:-latest
}
+ image: ${DOCKER_USER:-o
pensourcemano}/lcm:${TAG:-6
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-98,10
+101,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:
@@
-109,48
+114,67
@@
services:
# ports:
# - "3306:3306"
ro:
# ports:
# - "3306:3306"
ro:
- image: ${DOCKER_USER:-o
sm}/ro:${TAG:-latest
}
+ image: ${DOCKER_USER:-o
pensourcemano}/ro:${TAG:-6
}
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:
- "${OSM_RO_PORTS:-9090:9090}"
mon:
ports:
- "${OSM_RO_PORTS:-9090:9090}"
mon:
- image: ${DOCKER_USER:-o
sm}/mon:${TAG:-latest
}
+ image: ${DOCKER_USER:-o
pensourcemano}/mon:${TAG:-6
}
networks:
- netOSM
volumes:
- mon_db:/app/database
environment:
networks:
- netOSM
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:
- "${OSM_MON_PORTS:-8662:8662}"
#depends_on:
# - kafka
env_file:
- ./mon.env
ports:
- "${OSM_MON_PORTS:-8662:8662}"
#depends_on:
# - kafka
+ logging:
+ driver: "json-file"
+ options:
+ max-file: 5
+ max-size: 10m
pol:
pol:
- image: ${DOCKER_USER:-o
sm}/pol:${TAG:-latest
}
+ image: ${DOCKER_USER:-o
pensourcemano}/pol:${TAG:-6
}
networks:
- netOSM
networks:
- netOSM
+ volumes:
+ - pol_db:/app/database
environment:
environment:
- BROKER_URI: kafka:9092
+ OSMPOL_MESSAGE_HOST: kafka
+ OSMPOL_MESSAGE_PORT: 9092
+ env_file:
+ - ./pol.env
#depends_on:
# - kafka
# - mon
#depends_on:
# - kafka
# - mon
+ logging:
+ driver: "json-file"
+ options:
+ max-file: 5
+ max-size: 10m
light-ui:
light-ui:
- image: ${DOCKER_USER:-o
sm}/light-ui:${TAG:-latest
}
+ image: ${DOCKER_USER:-o
pensourcemano}/light-ui:${TAG:-6
}
networks:
- netOSM
environment:
OSM_SERVER: nbi
#depends_on:
# - nbi
networks:
- netOSM
environment:
OSM_SERVER: nbi
#depends_on:
# - nbi
+ env_file:
+ - ./lwui.env
ports:
- "${OSM_UI_PORTS:-80:80}"
ports:
- "${OSM_UI_PORTS:-80:80}"