Merge "Change default of network name to netosm"

[osm/devops.git] / installers / docker / docker-compose.yaml

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index c09de86..4a7503a 100644 (file)
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -4,10 +4,11 @@ volumes:
   mongo_db:
   mon_db:
   osm_packages:
+  keystone_db:
 networks:
   netOSM:
     external:
-      name: ${OSM_NETWORK:-netOSM}
+      name: ${OSM_NETWORK:-netosm}
     #driver: overlay
     #driver_opts:
     #  com.docker.network.driver.mtu: "1446"
@@ -45,6 +46,26 @@ services:
       - netOSM
     volumes:
       - mongo_db:/data/db
+  keystone-db:
+    image: mariadb:10
+    networks:
+      - netOSM
+    volumes:
+      - keystone_db:/var/lib/mysql
+    env_file:
+      - ./keystone-db.env
+#    ports:
+#      - "3306:3306"
+  keystone:
+    image: osm/keystone:${TAG:-latest}
+    networks:
+      - netOSM
+    environment:
+      DB_HOST: keystone-db
+    env_file:
+      - ./keystone.env
+    ports:
+      - "${OSM_KEYSTONE_PORTS:-5000:5000}"
   nbi:
     image: osm/nbi:${TAG:-latest}
     networks:
@@ -54,6 +75,8 @@ services:
     environment:
       OSMNBI_DATABASE_HOST: mongo
       OSMNBI_MESSAGE_HOST: kafka
+    env_file:
+      - ./nbi.env
     ports:
       - "${OSM_NBI_PORTS:-9999:9999}"
     #depends_on: