X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsrc%2Fmain%2Fyaml%2Fdocker-compose.yml;h=4e0de9b97f8d46156b8e0ef0604d00d27acd6619;hb=refs%2Fheads%2Fmaster;hp=01c972c4e741daf684bc5a5ffc8657613d7afe3d;hpb=32cd336379716eb9ca73b0ca67fb9fe1168149f4;p=sdnc%2Foam.git

diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index 01c972c4..f4cf673d 100644
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -20,9 +20,9 @@ services:
       - MYSQL_USER=${MYSQL_USER}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_DATABASE=${MYSQL_DATABASE}
-    logging:       
+    logging:
       driver:   "json-file"
-      options:  
+      options:
         max-size: "30m"
         max-file: "5"
 
@@ -31,7 +31,7 @@ services:
     depends_on :
       - db
     container_name: sdnc_ansible_container
-    entrypoint: ["/opt/onap/ccsdk/startAnsibleServer.sh"]
+    entrypoint: ["/opt/ansible-server/startAnsibleServer.sh"]
     ports:
       - "8000"
     links:
@@ -55,7 +55,7 @@ services:
     depends_on :
       - db
       - ansible
-    container_name: sdnc_controller_container
+    container_name: sdnc_controller
     entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
     ports:
       - "8282:8181"
@@ -66,6 +66,9 @@ services:
       - ansible:ansiblehost
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_USER=${MYSQL_USER}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+      - MYSQL_DATABASE=${MYSQL_DATABASE}
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
       - SDNC_BIN=/opt/onap/sdnc/bin
       - ODL_CERT_DIR=/tmp
@@ -73,7 +76,7 @@ services:
       - ODL_ADMIN_PASSWORD=${ODL_PASSWORD}
       - ODL_USER=${ODL_USER}
       - ODL_PASSWORD=${ODL_PASSWORD}
-      - SDNC_DB_INIT=true  
+      - SDNC_DB_INIT=true
       - HONEYCOMB_USER=${HONEYCOMB_USER}
       - HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD}
       - TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}
@@ -107,7 +110,7 @@ services:
     image: onap/ccsdk-dgbuilder-image:latest
     depends_on:
       - db
-    container_name:  sdnc_dgbuilder_container
+    container_name: sdnc_dgbuilder_container
     entrypoint:
        - "/bin/bash"
        - "-c"
@@ -135,7 +138,7 @@ services:
     image: onap/sdnc-ueb-listener-image:latest
     depends_on:
       - db
-    container_name:  sdnc_ueblistener_container
+    container_name: sdnc_ueblistener_container
     entrypoint: ["/opt/onap/sdnc/ueb-listener/bin/start-ueb-listener.sh" ]
     links:
       - db:dbhost
@@ -162,7 +165,7 @@ services:
     image: onap/sdnc-dmaap-listener-image:latest
     depends_on:
       - db
-    container_name:  sdnc_dmaaplistener_container
+    container_name: sdnc_dmaaplistener_container
     entrypoint: ["/opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh" ]
     links:
       - db:dbhost