summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2023-02-21 21:57:08 +0100
committerChristian Pointner <equinox@spreadspace.org>2023-02-21 21:57:08 +0100
commite822439d0a553d036b991514e18060c7e36b7315 (patch)
treef55e36fcddecfc929a83a3da020f647585153857
parentelevate-mediachannel: install ele-emc-r0 (diff)
ele-ups: upgrade to newest openwrt
-rw-r--r--inventory/group_vars/chaos-at-home-ups/vars.yml3
-rw-r--r--inventory/group_vars/ele-ups/vars.yml4
-rw-r--r--inventory/group_vars/ups/vars.yml25
-rw-r--r--inventory/hosts.ini2
4 files changed, 21 insertions, 13 deletions
diff --git a/inventory/group_vars/chaos-at-home-ups/vars.yml b/inventory/group_vars/chaos-at-home-ups/vars.yml
index 2a67bb76..31be4572 100644
--- a/inventory/group_vars/chaos-at-home-ups/vars.yml
+++ b/inventory/group_vars/chaos-at-home-ups/vars.yml
@@ -6,6 +6,9 @@ ups_query_sources:
- "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets['ch-mon']) | ansible.utils.ipaddr('address') }}"
- "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets['ch-equinox-ws']) | ansible.utils.ipaddr('address') }}"
+ups_ntp_servers:
+ - '{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets["ch-router"]) | ansible.utils.ipaddr("address") }}'
+
prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:9100"
prometheus_exporters_default:
diff --git a/inventory/group_vars/ele-ups/vars.yml b/inventory/group_vars/ele-ups/vars.yml
index 20fda933..6146bc37 100644
--- a/inventory/group_vars/ele-ups/vars.yml
+++ b/inventory/group_vars/ele-ups/vars.yml
@@ -9,6 +9,10 @@ ups_name: "{{ inventory_hostname | regex_replace('^ele-ups-(.*)$', '\\1') }}"
ups_query_sources:
- "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets['ele-calypso']) | ansible.utils.ipaddr('address') }}"
+ups_ntp_servers:
+ - '{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets["ele-router-hmtsaal"]) | ansible.utils.ipaddr("address") }}'
+ - '{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets["ele-router-orpheum"]) | ansible.utils.ipaddr("address") }}'
+
prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:9100"
prometheus_exporters_default:
diff --git a/inventory/group_vars/ups/vars.yml b/inventory/group_vars/ups/vars.yml
index 99328aec..842c5adb 100644
--- a/inventory/group_vars/ups/vars.yml
+++ b/inventory/group_vars/ups/vars.yml
@@ -14,15 +14,18 @@ openwrt_packages_remove:
- ppp-mod-pppoe
- dnsmasq
- firewall
+ - firewall4
- odhcpd
- odhcpd-ipv6only
+ - wpad-basic-wolfssl
+ - libustream-wolfssl
+ - nftables
openwrt_packages_add:
+ - hostapd-basic-openssl
+ - libustream-openssl
- haveged
- htop
- - ip
- - less
- - nano
- - tcpdump-mini
+ - ip-tiny
- usbutils
- kmod-usb-storage
- nut-server
@@ -78,13 +81,9 @@ openwrt_uci:
- name: timeserver 'ntp'
options:
- enabled: '0'
+ enabled: '{{ ups_ntp_servers is defined | ternary("1", "0") }}'
enable_server: '0'
- server:
- - '0.lede.pool.ntp.org'
- - '1.lede.pool.ntp.org'
- - '2.lede.pool.ntp.org'
- - '3.lede.pool.ntp.org'
+ server: "{{ ups_ntp_servers | default([]) }}"
dropbear:
- name: dropbear
@@ -113,11 +112,15 @@ openwrt_uci:
netmask: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr('netmask') }}"
accept_ra: 0
+ uhttpd:
+ - name: uhttpd main
+ options:
+ enabled: '0'
+
prometheus-node-exporter-lua:
- name: prometheus-node-exporter-lua 'main'
options:
listen_interface: 'mgmt'
- listen_ipv6: '0'
listen_port: '9100'
nut_server:
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 7af15fff..61bcf50a 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -451,8 +451,6 @@ ele-dione
ele-telesto
ele-router-hmtsaal
ele-router-emc
-ele-ap-hmtsaal[0:3]
-ele-ups-hmtsaal[0:2]
ele-router-orpheum
ele-thetys
[promzone-elevate-festival:children]