Updates for DFC new implentation

-Add Consul, CBS, Buscontroller Images

Change-Id: I3f0771e119a8388f7a437256ba656f278385c316
Issue-ID: INT-832
Signed-off-by: LiamBurke <liam.burke@ericsson.com>

2 files changed, 36 insertions, 6 deletions

diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-dfc.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-dfc.yml
new file mode 100644
index 00000000..aae77f71
--- /dev/null
+++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-dfc.yml
@@ -0,0 +1,12 @@
+version: '2.1'
+services:
+  dfc:
+    container_name: dfc
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest
+    ports:
+      - "8433:8433"
+    environment:
+       CONSUL_HOST: CONSUL_IP
+       CONSUL_PORT: 8500
+    extra_hosts:
+      - "dmaap-dr-node:DR_NODE_IP"
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
index d90f7b4d..e1e591d7 100644
--- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
+++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
@@ -68,14 +68,32 @@ services:
       - /host/upload:/home/admin
     command: admin:admin:1001
 
-  dfc:
-    container_name: dfc
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest
-    ports:
-      - "8433:8433"
-
   ves:
     container_name: vescollector
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.4.1
     environment:
        DMAAPHOST:
+
+  consul:
+    container_name: consul
+    image: nexus3.onap.org:10001/consul:latest
+
+  cbs:
+    container_name: cbs
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest
+    environment:
+       CONSUL_HOST:
+
+  buscontroller:
+    container_name: buscontroller
+    image: nexus3.onap.org:10001/onap/dmaap/dmaap-bc:1.1.1
+    ports:
+      - "18080:8080"
+      - "18443:8443"
+    extra_hosts:
+      - "dmaap-dr-prov:DMAAPDR"
+      - "message-router:DMAAPMR"
+    volumes:
+      - /tmp/docker-databus-controller.conf:/opt/app/config/conf
+    depends_on:
+      - datarouter-prov
\ No newline at end of file