From a9a8d69ff07a410e1231a89487cc87bb5a6ba29f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 15 Oct 2021 17:00:28 +0200 Subject: fix group_vars precedence for accesspoints --- inventory/group_vars/accesspoints/vars.yml | 6 ------ inventory/group_vars/chaos-at-home-ap/vars.yml | 5 +++++ inventory/group_vars/ele-ap/vars.yml | 5 +++++ 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'inventory') diff --git a/inventory/group_vars/accesspoints/vars.yml b/inventory/group_vars/accesspoints/vars.yml index cb2307cd..36b590a2 100644 --- a/inventory/group_vars/accesspoints/vars.yml +++ b/inventory/group_vars/accesspoints/vars.yml @@ -110,12 +110,6 @@ accesspoint_wireless_ifaces_yaml: | -prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}:9100" -prometheus_exporters_default: - - openwrt - - - install_playbook: openwrt openwrt_variant: openwrt diff --git a/inventory/group_vars/chaos-at-home-ap/vars.yml b/inventory/group_vars/chaos-at-home-ap/vars.yml index 05f564c6..1317bfa1 100644 --- a/inventory/group_vars/chaos-at-home-ap/vars.yml +++ b/inventory/group_vars/chaos-at-home-ap/vars.yml @@ -12,3 +12,8 @@ accesspoint_wifi_channels: accesspoint_zones: lan: "{{ network_zones.lan.wifi }}" iot: "{{ network_zones.iot.wifi }}" + + +prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}:9100" +prometheus_exporters_default: + - openwrt diff --git a/inventory/group_vars/ele-ap/vars.yml b/inventory/group_vars/ele-ap/vars.yml index bbffaa82..d77e7c1a 100644 --- a/inventory/group_vars/ele-ap/vars.yml +++ b/inventory/group_vars/ele-ap/vars.yml @@ -41,3 +41,8 @@ accesspoint_zones: lan: "{{ network_zones.lan.wifi }}" guest: "{{ network_zones.guest.wifi }}" infoscreens: "{{ network_zones.infoscreens.wifi }}" + + +prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}:9100" +prometheus_exporters_default: + - openwrt -- cgit v1.2.3