From cb7200e1eccd7d2f9409e875ccef1b23b56ed26e Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 16 Jun 2020 00:43:28 +0200 Subject: [PATCH] move to docker-compose.yml --- defaults/main.yml | 6 +++--- molecule/centos7/tests/test_default.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 125d4bb..37e14d2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -7,7 +7,7 @@ droneci_runner_docker_capacity: 2 droneci_runner_docker_server: droneci droneci_runner_docker_secret: myveryownsecret -droneci_runner_docker_service_directory: /var/lib/docker/services/droneci +droneci_runner_docker_service_directory: /var/lib/docker/services/droneci_runner_docker droneci_runner_docker_socket_path: /var/run/docker.sock droneci_runner_docker_service_stopped: False @@ -23,8 +23,8 @@ droneci_runner_docker_service_stopped: False # driver: host # @end droneci_runner_docker_networks: - - name: droneci + - name: droneci_droneci external: True droneci_runner_docker_networks_applied: - - droneci + - droneci_droneci diff --git a/molecule/centos7/tests/test_default.py b/molecule/centos7/tests/test_default.py index aff2026..b391234 100644 --- a/molecule/centos7/tests/test_default.py +++ b/molecule/centos7/tests/test_default.py @@ -10,5 +10,5 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_droneci_compose_file(host): - f = host.file('/var/lib/docker/services/droneci/droneci_runner_docker.yml') + f = host.file('/var/lib/docker/services/droneci_runner_docker/docker-compose.yml') assert f.exists