Fix problem with expired certs in FTPES tests

[integration.git] / test / mocks / datafilecollector-testharness / simulator-group / docker-compose-template.yml

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml
index 01113e3..255d732 100644 (file)
--- a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml
+++ b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml
@@ -7,41 +7,6 @@ networks:
 
 services:
 
-  consul-server:
-    networks:
-      - dfcnet
-    container_name: dfc_consul
-    image: nexus3.onap.org:10001/onap/oom/consul:2.1.0
-    ports:
-      - "8500:8500"
-    entrypoint: /usr/local/bin/docker-entrypoint.sh agent -dev -client 0.0.0.0
-    volumes:
-      - ./consul/consul/:/consul/config
-
-  config-binding-service:
-    networks:
-      - dfcnet
-    container_name: dfc_cbs
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding:2.5.3
-    ports:
-      - "10000:10000"
-    command: sh -c "
-      unset PROD_LOGGING;
-      /usr/local/bin/run.py;
-      "
-    environment:
-      - CONSUL_HOST=consul-server
-    depends_on:
-      - consul-server
-
-  tls-init-container:
-    container_name: dfc_tls-init-container
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tls-init-container:1.0.4
-    networks:
-      - dfcnet
-    volumes:
-      - ./tls:/opt/tls/shared:rw
-
   cmpv2-postprocessor:
     container_name: dfc_cmpv2-postprocessor
     image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:2.3.3
@@ -50,8 +15,6 @@ services:
     volumes:
       - ${SIM_GROUP}/tls:/opt/app/datafile/etc/cert
       - ${SIM_GROUP}/../certservice/generated-certs/dfc-p12:/opt/app/datafile/etc/
-    depends_on:
-      - tls-init-container
 
   drsim:
     networks:
@@ -67,8 +30,6 @@ services:
     command: node dmaapDR.js ${DR_TC}
     volumes:
       - ./tls:/app/cert/:rw
-    depends_on:
-      - tls-init-container
 
   drsim_redir:
     networks:
@@ -84,8 +45,6 @@ services:
     command: node dmaapDR_redir.js ${DR_REDIR_TC}
     volumes:
       - ./tls:/app/cert/:rw
-    depends_on:
-      - tls-init-container
 
   mrsim:
     networks:
@@ -110,8 +69,6 @@ services:
     command: python mr-sim.py ${MR_TC}
     volumes:
       - ./tls:/app/cert/:rw
-    depends_on:
-      - tls-init-container
 
   sftp-server0:
     networks:
@@ -177,8 +134,6 @@ services:
     command: vsftpd /etc/vsftpd_ssl.conf
     volumes:
       - ./tls:/etc/ssl/private/:rw
-    depends_on:
-      - tls-init-container
 
   ftpes-server-vsftpd1:
     networks:
@@ -194,8 +149,6 @@ services:
     command: vsftpd /etc/vsftpd_ssl.conf
     volumes:
       - ./tls:/etc/ssl/private/:rw
-    depends_on:
-      - tls-init-container
 
   ftpes-server-vsftpd2:
     networks:
@@ -211,8 +164,6 @@ services:
     command: vsftpd /etc/vsftpd_ssl.conf
     volumes:
       - ./tls:/etc/ssl/private/:rw
-    depends_on:
-      - tls-init-container
 
   ftpes-server-vsftpd3:
     networks:
@@ -228,8 +179,6 @@ services:
     command: vsftpd /etc/vsftpd_ssl.conf
     volumes:
       - ./tls:/etc/ssl/private/:rw
-    depends_on:
-      - tls-init-container
 
   ftpes-server-vsftpd4:
     networks:
@@ -245,8 +194,6 @@ services:
     command: vsftpd /etc/vsftpd_ssl.conf
     volumes:
       - ./tls:/etc/ssl/private/:rw
-    depends_on:
-      - tls-init-container
 
   http-https-server0:
     networks: