Explorar el Código

Revert "Attempt to fix docker_network result discrepancy between Ansible versions"

This reverts commit 68ca81c8c2.
pull/1006/head
Slavi Pantaleev hace 5 años
padre
commit
badd81e0ec
Se han modificado 1 ficheros con 1 adiciones y 3 borrados
  1. +1
    -3
      roles/matrix-prometheus/tasks/setup_install.yml

+ 1
- 3
roles/matrix-prometheus/tasks/setup_install.yml Ver fichero

@@ -30,10 +30,8 @@
driver: bridge driver: bridge
register: matrix_docker_network_info register: matrix_docker_network_info


# The `matrix_docker_network_info.ansible_facts.docker_network` workaroudn is for Ansible <= 2.8.
# See: https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/907
- set_fact: - set_fact:
matrix_prometheus_scraper_node_targets: ["{{ matrix_docker_network_info.network|default(matrix_docker_network_info.ansible_facts.docker_network).IPAM.Config[0].Gateway }}:9100"]
matrix_prometheus_scraper_node_targets: ["{{ matrix_docker_network_info.network.IPAM.Config[0].Gateway }}:9100"]
when: "matrix_prometheus_scraper_node_enabled|bool and matrix_prometheus_scraper_node_targets|length == 0" when: "matrix_prometheus_scraper_node_enabled|bool and matrix_prometheus_scraper_node_targets|length == 0"






Cargando…
Cancelar
Guardar