X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker-compose-app.yml;h=2203ac1e1d8cd9b90206a08e1da14374487c616d;hb=28a7d366576335b71a99c5a572e68747246d6b70;hp=c59099b48c2da9bed2bb78bb28647fa6a0393029;hpb=d3eeb821e65e48295500a6d8ed52a7f73c8fe733;p=aai%2Ftest-config.git

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index c59099b..2203ac1 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -6,12 +6,13 @@ services:
     environment:
       - LOCAL_USER_ID=${USER_ID}
       - LOCAL_GROUP_ID=${GROUP_ID}
+      - SKIP_CREATE_DB_SCHEMA_AT_STARTUP=true
     ports:
       - 8447:8447
     volumes:
       - ${RESOURCES_LOGS}:/opt/aai/logroot/AAI-RES
-      - /opt/test-config/aai-resources/appconfig/titan-realtime.properties:/opt/app/aai-resources/resources/etc/appprops/titan-realtime.properties
-      - /opt/test-config/aai-resources/appconfig/titan-cached.properties:/opt/app/aai-resources/resources/etc/appprops/titan-cached.properties
+      - /opt/test-config/aai-resources/appconfig/janusgraph-realtime.properties:/opt/app/aai-resources/resources/etc/appprops/janusgraph-realtime.properties
+      - /opt/test-config/aai-resources/appconfig/janusgraph-cached.properties:/opt/app/aai-resources/resources/etc/appprops/janusgraph-cached.properties
       - /opt/test-config/aai-resources/appconfig/aaiconfig.properties:/opt/app/aai-resources/resources/etc/appprops/aaiconfig.properties
       - /opt/test-config/aai-resources/appconfig/application.properties:/opt/app/aai-resources/resources/application.properties
       - /opt/test-config/aai-resources/appconfig/logback.xml:/opt/app/aai-resources/resources/logback.xml
@@ -27,16 +28,13 @@ services:
     image: ${DOCKER_REGISTRY}/onap/aai-traversal
     hostname: aai-traversal.api.simpledemo.onap.org
     environment:
-      - AAI_CHEF_ENV=simpledemo
-      - AAI_CHEF_LOC=/var/chef/aai-data/environments
-      - CHEF_BRANCH=master
-      - CHEF_GIT_URL=http://gerrit.onap.org/r/aai
-      - AAI_CORE_VERSION=1.1.0-SNAPSHOT
       - LOCAL_USER_ID=${USER_ID}
+      - LOCAL_GROUP_ID=${GROUP_ID}
+      - DISABLE_UPDATE_QUERY=true
     volumes:
       - ${TRAVERSAL_LOGS}:/opt/aai/logroot/AAI-GQ
-      - /opt/test-config/aai-traversal/appconfig/titan-realtime.properties:/opt/app/aai-traversal/resources/etc/appprops/titan-realtime.properties
-      - /opt/test-config/aai-traversal/appconfig/titan-cached.properties:/opt/app/aai-traversal/resources/etc/appprops/titan-cached.properties
+      - /opt/test-config/aai-traversal/appconfig/janusgraph-realtime.properties:/opt/app/aai-traversal/resources/etc/appprops/janusgraph-realtime.properties
+      - /opt/test-config/aai-traversal/appconfig/janusgraph-cached.properties:/opt/app/aai-traversal/resources/etc/appprops/janusgraph-cached.properties
       - /opt/test-config/aai-traversal/appconfig/aaiconfig.properties:/opt/app/aai-traversal/resources/etc/appprops/aaiconfig.properties
       - /opt/test-config/aai-traversal/appconfig/application.properties:/opt/app/aai-traversal/resources/application.properties
       - /opt/test-config/aai-traversal/appconfig/logback.xml:/opt/app/aai-traversal/resources/logback.xml
@@ -60,6 +58,8 @@ services:
       - aai-traversal.api.simpledemo.onap.org
     volumes:
       - /dev/log:/dev/log
+      - /opt/test-config/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
+      - /opt/test-config/haproxy/aai.pem:/etc/ssl/private/aai.pem
     logging:
       driver: "json-file"
       options:
@@ -124,13 +124,14 @@ services:
     hostname: sparky-be
     volumes:
       - ${UI_LOGS}:/logs
-      - /opt/test-config/sparky/appconfig:/opt/app/sparky/config
+      - /opt/test-config/sparky/appconfig:/opt/app/sparky/appconfig
     ports:
       - 9517:9517
     environment:
-      - CONFIG_HOME=/opt/app/sparky/config
-      - KEY_STORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-      - KEY_MANAGER_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
+      - KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - KEYSTORE_ALIAS_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - SPARKY_SSL_ENABLED=false
+      - SPARKY_PORTAL_ENABLED=true
     logging:
       driver: "json-file"
       options:
@@ -138,7 +139,7 @@ services:
         max-file: "5"
 
   champ-service:
-    image: ${DOCKER_REGISTRY}/onap/champ-service
+    image: ${DOCKER_REGISTRY}/onap/champ
     hostname: champ-service
     volumes:
       - ${CHAMP_LOGS}:/logs
@@ -155,15 +156,15 @@ services:
       - AJSC_JETTY_BLOCKING_QUEUE_SIZE=200
       - MAX_HEAP=1024
       - SERVICE_BEANS=/opt/app/champ-service/dynamic/conf
-      - GRAPHIMPL=titan-deps
+      - GRAPHIMPL=janus-deps
     logging:
       driver: "json-file"
       options:
         max-size: "30m"
         max-file: "5"
-        
+
   crud-service:
-    image: ${DOCKER_REGISTRY}/onap/crud-service
+    image: ${DOCKER_REGISTRY}/onap/gizmo
     hostname: crud-service
     volumes:
       - ${CRUD_LOGS}:/logs
@@ -186,6 +187,23 @@ services:
         max-size: "30m"
         max-file: "5"
 
+  babel:
+    image: ${DOCKER_REGISTRY}/onap/babel
+    hostname: babel
+    volumes:
+      - ${BABEL_LOGS}:/logs
+      - /opt/test-config/babel/appconfig:/opt/app/babel/config      
+    ports:
+      - 9516:9516
+    environment:
+      - CONFIG_HOME=/opt/app/babel/config/
+      - KEY_STORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+      - KEY_MANAGER_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
 networks:
   default:
       driver: bridge