From c87d2f0b2717317582c044ad640c6164c2da635c Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 30 Jan 2024 21:11:28 +0200 Subject: [PATCH] Switch from grafana_container_additional_networks to grafana_container_additional_networks_reverse_proxy --- templates/group_vars_mash_servers | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/templates/group_vars_mash_servers b/templates/group_vars_mash_servers index d5ebec0..61778ae 100644 --- a/templates/group_vars_mash_servers +++ b/templates/group_vars_mash_servers @@ -2012,15 +2012,11 @@ grafana_base_path: "{{ mash_playbook_base_path }}/{{ mash_playbook_service_base_ grafana_uid: "{{ mash_playbook_uid }}" grafana_gid: "{{ mash_playbook_gid }}" -grafana_container_additional_networks: "{{ grafana_container_additional_networks_reverse_proxy + grafana_container_additional_networks_additional }}" - -grafana_container_additional_networks_reverse_proxy: | +grafana_container_additional_networks_auto: | {{ - ([mash_playbook_reverse_proxyable_services_additional_network] if mash_playbook_reverse_proxyable_services_additional_network else []) + ([mash_playbook_reverse_proxyable_services_additional_network] if (grafana_container_labels_traefik_enabled and mash_playbook_reverse_proxyable_services_additional_network) else []) }} -grafana_container_additional_networks_additional: [] - grafana_container_labels_traefik_enabled: "{{ mash_playbook_traefik_labels_enabled }}" grafana_container_labels_traefik_docker_network: "{{ mash_playbook_reverse_proxyable_services_additional_network }}" grafana_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}"