Compare commits

...

6 Commits

Author SHA1 Message Date
Gregor Michels 1a834de455 gateways: enable lldp 2023-01-08 06:28:47 +01:00
Gregor Michels 2d85ba5226 accesspoints: enable lldp 2023-01-08 05:58:50 +01:00
Gregor Michels d5617ce1e9 accesspoints: upgrade to OpenWrt 22.03 2023-01-08 05:44:17 +01:00
Gregor Michels dce505c762 playbook_sysupgrade: stringify garet_release
when garet_release only contains digets, playbook_sysupgrade compared
the string from the device itself against an integer from the inventory
always triggering an upgrade.

This should fix this corner case
2023-01-08 04:54:21 +01:00
Gregor Michels 26884f6d8d gateways: fix mismatch between inventory fw name and backed in fw name
for some reason i've misspelled the fw profile name for the two gateways
resulting in `playbook_sysupgrade` always wanting to upgrade the
firmware
2023-01-08 04:54:21 +01:00
Gregor Michels ff623aec65 playbook_provision_accesspoints: do not install wifi.lua via ansible
all aps are on firmware that ships with this file.
No need to let ansible install it again
2023-01-08 04:54:21 +01:00
8 changed files with 113 additions and 16 deletions

View File

@ -23,8 +23,8 @@ ap-b682 ip=10.85.1.40 location=tent-3 channel_2g=11 channel_5g=64 txpo
[accesspoints:vars]
ansible_remote_tmp=/tmp
garet_profile=aruba-ap-105_21.02
garet_release=845a6ba
garet_profile=aruba-ap-105_22.03
garet_release=9974455
[switches]
sw-access01 ip=10.84.1.11 base_mac=bc:cf:4f:e3:bb:8d
@ -41,7 +41,7 @@ ffl-ans-gw-core01 ip=10.85.1.1
[gateways:vars]
ansible_remote_tmp=/tmp
garet_profile=sophos-sg-125r2-22.03
garet_profile=sophos-sg-125r2_22.03
garet_release=89cbd27
[server]

View File

@ -1338,3 +1338,47 @@ Afterwards we disabled the temporary backoffice wifi in tent 1 (`e3d8369`).
The new ap is connected via a `CAT.7 outdoor 30m` cable and is plugged into `sw-acces01 port 6`.
This closes incident `031`.
034 2023.01.08 04:00 - 05:30 | (maintenance) bring accesspoints onto OpenWrt 22.03
----------------------------------------------------------------------------------
**target version**:
```
-----------------------------------------------------
https://git.sr.ht/~hirnpfirsich/garet
garet 9974455, aruba-ap-105_22.03
-----------------------------------------------------
```
**changelog**:
* `OpenWrt 22.03.2`
* support for `lldp` -- needs to be configured
**canary test**:
* `ap-c5d1` (adp)
* `ap-b6ee` (ans)
* down from 04:00 - 04:05
* `playbook_provision_accesspoints` restarted wifi on `ap-c5d1` 04:21 one more time
**Deutscher Platz**:
* down from 05:00 - 05:06
* `playbook_provision_accesspoints` restarted wifi on the following aps again at around 05:10
* `ap-8f39`
* `ap-c495`
* `ap-ac7c`
* `ap-0b99`
**Arno-Nitzsche-Str**:
* down from 05:21 - 05:27
* `playbook_provision_accesspoints` did not restart the wifi again
**summarized impact**:
* `Arno-Nitzsche-Str`: wifi down from 05:21 - 05:27
* `ap-b6ee` from 04:00 - 04:05
* `Deutscher Platz`: wifi down from 05:00 - 05:06
* `ap-c5d1` from 04:00 - 04:05
* `ap-8f39` additional wifi restart at 05:10
* `ap-c495` additional wifi restart at 05:10
* `ap-ac7c` additional wifi restart at 05:10
* `ap-0b99` additional wifi restart at 05:10

View File

@ -12,16 +12,6 @@
notify:
- "reload {{ item | basename }}"
- name: install custom prometheus-node-exporter-lua-wifi
copy:
src: files/wifi.lua
dest: /usr/lib/lua/prometheus-collectors/wifi.lua
owner: root
group: root
mode: 0755
notify:
- restart prometheus-node-exporter-lua
handlers:
- name: reload network
service:
@ -36,7 +26,7 @@
name: system
state: reloaded
- name: restart prometheus-node-exporter-lua
- name: reload lldpd
service:
name: prometheus-node-exporter-lua
state: restarted
name: lldpd
state: reloaded

View File

@ -38,6 +38,11 @@
notify:
- restart frr
- name: install lldpd
opkg:
name: lldpd
update_cache: yes
handlers:
- name: reload dhcp
service:
@ -69,6 +74,11 @@
name: frr
state: restarted
- name: reload lldpd
service:
name: lldpd
state: reloaded
- name: custom changes for ffl-ans-gw-core01 (offloader vm, ...)
hosts: ffl-ans-gw-core01
tasks:

View File

@ -16,6 +16,10 @@
setup:
filter: ansible_local
- name: stringify garet_release...
set_fact:
garet_release: "{{ garet_release | string }}"
- name: handle update
block:
- name: upload new firmware

View File

@ -0,0 +1,13 @@
config lldpd config
option enable_cdp 0
option enable_fdp 0
option enable_sonmp 0
option enable_edp 0
option lldp_class 4
option lldp_mgmt_ip "{{ ip }}"
option lldp_location "{{ location }}"
list interface "loopback"
list interface "eth0"

View File

@ -0,0 +1,16 @@
config lldpd config
option enable_cdp 0
option enable_fdp 0
option enable_sonmp 0
option enable_edp 0
option lldp_class 4
option lldp_mgmt_ip "{{ ip }}"
option lldp_location ""
list interface "loopback"
list interface "eth0"
list interface "eth1"
list interface "eth2"
list interface "eth3"

View File

@ -0,0 +1,20 @@
config lldpd config
option enable_cdp 0
option enable_fdp 0
option enable_sonmp 0
option enable_edp 0
option lldp_class 4
option lldp_mgmt_ip "{{ ip }}"
option lldp_location ""
list interface "loopback"
list interface "eth0"
list interface "eth1"
list interface "eth2"
list interface "eth3"
list interface "eth4"
list interface "eth5"
list interface "eth6"
list interface "eth7"