revert to previous demo configuration

Mirantis · Dec 27, 2017 · 2f9c260 · 2f9c260
1 parent f06adee
commit 2f9c260
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/docker-compose.demo.yml b/docker-compose.demo.yml
@@ -1,33 +1,32 @@
 version: '2'
 services:
-#  api:
-#    image: kqueen/api:master
-#    ports:
-#      - 127.0.0.1:5000:5000
-#    depends_on:
-#      - etcd
-#    environment:
-#      KQUEEN_CONFIG_FILE: config/prod.py
-#      KQUEEN_ETCD_HOST: etcd
-#      KQUEEN_DEBUG: 'True'
-#      BOOTSTRAP_ADMIN: 1
-#      BOOTSTRAP_ADMIN_USERNAME: admin
-#      BOOTSTRAP_ADMIN_PASSWORD: default
-#      BOOTSTRAP_ADMIN_ORGANIZATION: DemoOrg
-#      BOOTSTRAP_ADMIN_NAMESPACE: demoorg
-#    extra_hosts:
-#      - "ci.mcp.mirantis.net:172.16.48.254"
+  api:
+    image: kqueen/api:v0.11
+    ports:
+      - 127.0.0.1:5000:5000
+    depends_on:
+      - etcd
+    environment:
+      KQUEEN_CONFIG_FILE: config/prod.py
+      KQUEEN_ETCD_HOST: etcd
+      #KQUEEN_DEBUG: 'True'
+      BOOTSTRAP_ADMIN: 1
+      BOOTSTRAP_ADMIN_USERNAME: admin
+      BOOTSTRAP_ADMIN_PASSWORD: default
+      BOOTSTRAP_ADMIN_ORGANIZATION: DemoOrg
+      BOOTSTRAP_ADMIN_NAMESPACE: demoorg
+    extra_hosts:
+      - "ci.mcp.mirantis.net:172.16.48.254"
   ui:
     image: kqueen/ui:v0.1
-    network_mode: host
     ports:
       - 127.0.0.1:5080:5080
-#    depends_on:
-#      - api
+    depends_on:
+      - api
     environment:
       KQUEEN_UI_CONFIG_FILE: config/prod.py
-      KQUEENUI_KQUEEN_API_URL: http://172.16.0.65:5000/api/v1/
-      KQUEENUI_KQUEEN_AUTH_URL: http://172.16.0.65:5000/api/v1/auth
+      KQUEENUI_KQUEEN_API_URL: http://api:5000/api/v1/
+      KQUEENUI_KQUEEN_AUTH_URL: http://api:5000/api/v1/auth
       KQUEENUI_KQUEEN_SERVICE_USER_USERNAME: admin
       KQUEENUI_KQUEEN_SERVICE_USER_PASSWORD: default
       KQUEENUI_MAIL_SERVER: mail