X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsrc%2Fmain%2Fyaml%2Fdocker-compose.yml;h=96f9bb32a260fc13c3ca5ed36374039fa58ff268;hb=6ee5a32752bd838225b9cbacd22ed451fd24c9a6;hp=68d0287892ead26dbc22dbe84c0c2968ce3a7868;hpb=e4a0c2981b814cc8de238cac0f488d49e46b2306;p=sdnc%2Foam.git

diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index 68d02878..96f9bb32 100644
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -22,23 +22,53 @@ services:
         max-size: "30m"
         max-file: "5"
 
+  ansible:
+    image: onap/sdnc-ansible-server-image:latest
+    depends_on :
+      - db
+    container_name: sdnc_ansible_container
+    entrypoint: ["/opt/onap/ccsdk/startAnsibleServer.sh"]
+    ports:
+      - "8000"
+    links:
+      - db:dbhost
+      - db:sdnctldb01
+      - db:sdnctldb02
+    environment:
+      - MYSQL_ROOT_PASSWORD=openECOMP1.0
+    logging:
+      driver:   "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
 
   sdnc:
-    image: nexus3.onap.org:10001/onap/sdnc-image:latest
+    image: onap/sdnc-image:latest
     depends_on :
       - db
+      - ansible
     container_name: sdnc_controller_container
     entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
     ports:
       - "8282:8181"
-      - "8201:8101"
     links:
       - db:dbhost
       - db:sdnctldb01
       - db:sdnctldb02
+      - ansible:ansiblehost
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - SDNC_BIN=/opt/onap/sdnc/bin
+      - ODL_CERT_DIR=/tmp
+      - ODL_ADMIN_USERNAME=admin
+      - ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+      - A1_TRUSTSTORE_PASSWORD=a1adapter
+    # The default truststore for A1 adapter can be overridden by mounting a new
+    # truststore (uncomment the lines below), whereas the corresponding password
+    # should be updated in A1_TRUSTSTORE_PASSWORD environment variable (in the line above)
+    #volumes:
+    #  - ./a1_truststore.jks:/opt/onap/sdnc/data/stores/truststore.a1.adapter.jks:ro
     dns:
       - ${DNS_IP_ADDR-10.0.100.1}
     logging:
@@ -46,10 +76,12 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
+    extra_hosts:
+        aaf.osaaf.org: 10.12.6.214
 
 
   web:
-    image: nexus3.onap.org:10001/onap/admportal-sdnc-image:latest
+    image: onap/admportal-sdnc-image:latest
     depends_on:
       - db
     container_name: sdnc_portal_container
@@ -59,6 +91,7 @@ services:
        - "cd /opt/onap/sdnc/admportal/shell && ./start_portal.sh"
     ports:
       - "8843:8843"
+      - "8443:8443"
     links:
       - db:dbhost
       - db:sdnctldb01
@@ -67,6 +100,7 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - CERT_PSWD=onap3.0
     logging:
       driver:   "json-file"
       options:
@@ -75,14 +109,14 @@ services:
 
 
   dgbuilder:
-    image: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:latest
+    image: onap/ccsdk-dgbuilder-image:latest
     depends_on:
       - db
     container_name:  sdnc_dgbuilder_container
     entrypoint:
        - "/bin/bash"
        - "-c"
-       - "cd /opt/onap/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait"
+       - "cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait"
     ports:
       - "3000:3100"
     links:
@@ -92,16 +126,15 @@ services:
       - sdnc:sdnhost
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
-      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
     logging:
       driver:   "json-file"
       options:
         max-size: "30m"
         max-file: "5"
 
-
   ueblistener:
-    image: nexus3.onap.org:10001/onap/sdnc-ueb-listener-image:1.2-STAGING-latest
+    image: onap/sdnc-ueb-listener-image:latest
     depends_on:
       - db
     container_name:  sdnc_ueblistener_container
@@ -119,3 +152,23 @@ services:
       options:
         max-size: "30m"
         max-file: "5"
+
+  dmaaplistener:
+    image: onap/sdnc-dmaap-listener-image:latest
+    depends_on:
+      - db
+    container_name:  sdnc_dmaaplistener_container
+    entrypoint: ["/opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh" ]
+    links:
+      - db:dbhost
+      - db:sdnctldb01
+      - db:sdnctldb02
+      - sdnc:sdnhost
+    environment:
+      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - PROPERTY_DIR=/opt/onap/sdnc/data/properties
+    logging:
+      driver:   "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"