Revert "Work around buggy docker_network sometimes failing to work"
The docker_network bug was fixed two years ago
This reverts commit 36658addcd
.
This commit is contained in:
parent
a5ae7e9ef0
commit
6921ec4b8a
|
@ -19,31 +19,10 @@
|
||||||
mode: '0660'
|
mode: '0660'
|
||||||
when: "matrix_vars_yml_snapshotting_enabled|bool"
|
when: "matrix_vars_yml_snapshotting_enabled|bool"
|
||||||
|
|
||||||
# `docker_network` doesn't work as expected when the given network
|
- name: Ensure Matrix network is created in Docker
|
||||||
# is a substring of a network that already exists.
|
docker_network:
|
||||||
#
|
name: "{{ matrix_docker_network }}"
|
||||||
# See:
|
driver: bridge
|
||||||
# - https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/12
|
|
||||||
# - https://github.com/ansible/ansible/issues/32926
|
|
||||||
#
|
|
||||||
# Due to that, we employ a workaround below.
|
|
||||||
#
|
|
||||||
# - name: Ensure Matrix network is created in Docker
|
|
||||||
# docker_network:
|
|
||||||
# name: "{{ matrix_docker_network }}"
|
|
||||||
# driver: bridge
|
|
||||||
|
|
||||||
- name: Check existence of Matrix network in Docker
|
|
||||||
shell:
|
|
||||||
cmd: "docker network ls -q --filter='name=^{{ matrix_docker_network }}$'"
|
|
||||||
register: result_check_docker_network
|
|
||||||
changed_when: false
|
|
||||||
check_mode: no
|
|
||||||
|
|
||||||
- name: Create Matrix network in Docker
|
|
||||||
shell:
|
|
||||||
cmd: "docker network create --driver=bridge {{ matrix_docker_network }}"
|
|
||||||
when: "result_check_docker_network.stdout == '' and not ansible_check_mode"
|
|
||||||
|
|
||||||
- name: Ensure matrix-remove-all script created
|
- name: Ensure matrix-remove-all script created
|
||||||
template:
|
template:
|
||||||
|
|
Loading…
Reference in a new issue