summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/openwrt-deploy.yml2
-rw-r--r--inventory/group_vars/accesspoints/vars.yml1
-rw-r--r--inventory/group_vars/ups/vars.yml1
-rw-r--r--inventory/host_vars/ch-router.yml1
-rw-r--r--inventory/host_vars/ele-router-emc.yml1
-rw-r--r--inventory/host_vars/ele-router-hmtsaal.yml1
-rw-r--r--inventory/host_vars/ele-router-orpheum.yml1
-rw-r--r--inventory/host_vars/ele-tub.yml1
8 files changed, 1 insertions, 8 deletions
diff --git a/common/openwrt-deploy.yml b/common/openwrt-deploy.yml
index 1ef70a5e..ab80637f 100644
--- a/common/openwrt-deploy.yml
+++ b/common/openwrt-deploy.yml
@@ -14,7 +14,7 @@
hosts: "{{ install_hostname }}"
gather_facts: no
roles:
- - role: openwrt/deploy
+ - role: installer/openwrt/deploy
post_tasks:
- name: remove host-keys from ssh known-hosts
local_action: command "{{ (inventory_dir, '../remove-known-host.sh') | path_join | realpath }}" "{{ install_hostname }}"
diff --git a/inventory/group_vars/accesspoints/vars.yml b/inventory/group_vars/accesspoints/vars.yml
index 8c4d44db..5545dae7 100644
--- a/inventory/group_vars/accesspoints/vars.yml
+++ b/inventory/group_vars/accesspoints/vars.yml
@@ -150,7 +150,6 @@ openwrt_packages_add:
- tcpdump-mini
- horst
- prometheus-node-exporter-lua
- - prometheus-node-exporter-lua-nat_traffic
- prometheus-node-exporter-lua-netstat
- prometheus-node-exporter-lua-openwrt
## we will install a custom version of these collectors, see below
diff --git a/inventory/group_vars/ups/vars.yml b/inventory/group_vars/ups/vars.yml
index bfcbb0a7..52cc65ac 100644
--- a/inventory/group_vars/ups/vars.yml
+++ b/inventory/group_vars/ups/vars.yml
@@ -30,7 +30,6 @@ openwrt_packages_add:
- nut-upsc
- nut-upscmd
- prometheus-node-exporter-lua
- - prometheus-node-exporter-lua-nat_traffic
- prometheus-node-exporter-lua-netstat
- prometheus-node-exporter-lua-openwrt
diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml
index 9c07b42d..3f31bcbe 100644
--- a/inventory/host_vars/ch-router.yml
+++ b/inventory/host_vars/ch-router.yml
@@ -49,7 +49,6 @@ openwrt_packages_add:
- wireguard-tools
- iptraf-ng
- prometheus-node-exporter-lua
- - prometheus-node-exporter-lua-nat_traffic
- prometheus-node-exporter-lua-netstat
- prometheus-node-exporter-lua-openwrt
diff --git a/inventory/host_vars/ele-router-emc.yml b/inventory/host_vars/ele-router-emc.yml
index ae933d1a..9a1199ec 100644
--- a/inventory/host_vars/ele-router-emc.yml
+++ b/inventory/host_vars/ele-router-emc.yml
@@ -138,7 +138,6 @@ openwrt_packages_add:
- mtr
- iptraf-ng
- prometheus-node-exporter-lua
- - prometheus-node-exporter-lua-nat_traffic
- prometheus-node-exporter-lua-netstat
- prometheus-node-exporter-lua-openwrt
diff --git a/inventory/host_vars/ele-router-hmtsaal.yml b/inventory/host_vars/ele-router-hmtsaal.yml
index 426e4c02..827e207e 100644
--- a/inventory/host_vars/ele-router-hmtsaal.yml
+++ b/inventory/host_vars/ele-router-hmtsaal.yml
@@ -170,7 +170,6 @@ openwrt_packages_add:
- sqm-scripts
- openvpn-openssl
- prometheus-node-exporter-lua
- - prometheus-node-exporter-lua-nat_traffic
- prometheus-node-exporter-lua-netstat
- prometheus-node-exporter-lua-openwrt
diff --git a/inventory/host_vars/ele-router-orpheum.yml b/inventory/host_vars/ele-router-orpheum.yml
index 890bd293..9b0fad43 100644
--- a/inventory/host_vars/ele-router-orpheum.yml
+++ b/inventory/host_vars/ele-router-orpheum.yml
@@ -168,7 +168,6 @@ openwrt_packages_add:
- sqm-scripts
- openvpn-openssl
- prometheus-node-exporter-lua
- - prometheus-node-exporter-lua-nat_traffic
- prometheus-node-exporter-lua-netstat
- prometheus-node-exporter-lua-openwrt
diff --git a/inventory/host_vars/ele-tub.yml b/inventory/host_vars/ele-tub.yml
index 46d165e8..ff950a29 100644
--- a/inventory/host_vars/ele-tub.yml
+++ b/inventory/host_vars/ele-tub.yml
@@ -38,7 +38,6 @@ openwrt_packages_add:
- mtr
- iptraf-ng
- prometheus-node-exporter-lua
- - prometheus-node-exporter-lua-nat_traffic
- prometheus-node-exporter-lua-netstat
- prometheus-node-exporter-lua-openwrt