claude-botandClaude Opus 5
2d9c3ba213
edge-host was a single role doing eight unrelated jobs: flash-wear
mitigation, log shipping, VLAN networking, an MQTT bridge, a CAN interface,
the heating CAN services, a Z-Wave gateway and a power-meter reader.
That is not just untidy. It is what blocked a second thin client from
joining as an NTP peer: the host-generic work (journald to RAM, Alloy, the
VLAN sub-interface) could not be applied without also handing the box a
Z-Wave radio and a CAN bus it does not have. The role bound its services to
specific USB device paths, so a second host would have tried to start
containers for hardware that is not there.
Now:
edge-flash-wear journald -> RAM, noatime/lazytime, TRIM, eMMC health
edge-log-shipper Alloy: journal -> Loki
edge-vlan tagged VLAN sub-interface
mqtt-bridge loopback mosquitto -> cluster broker over TLS
socketcan can0 only
heating-can open3e (Vitocal/VX3) + e3oncan (E380 meter)
zwave-gateway zwave-js-ui, own compose project
power-meter-sml sml2mqtt, own compose project
The E380 reader lives with open3e rather than in its own role: it is part
of the same heating installation -- it feeds the heat pump's own energy
management -- not a separate system that happens to share a bus. can0 does
stay separate, because an interface is not the same concern as the services
consuming it.
Each role installs its own packages, so it stands alone. An edge host with
no peripherals takes the first five and none of the rest.
docker-daemon.json moves to docker-install with its own docker_log_driver
variable and Restart docker handler, since configuring the docker daemon was
never an edge-host concern. Handlers split ten ways; defaults split per
role; all sixteen templates and files moved with git mv.
Two deliberate behaviour changes on the node, both accepted:
1. Compose split. zwave-js and sml2mqtt shared a compose file, so touching
either recreated both. They are now separate projects in their own
directories. container_name is fixed, so the old project must release the
names first -- a guarded one-time task downs it and removes the file.
First apply costs a brief down/up on both. Data paths are unchanged; the
zwave store is not migrated.
2. Header repointing. Templates and scripts carried "Managed by
roles/edge-host" headers, which render onto the host -- they would have
sent an operator to a role that no longer exists. Updating them changes
file content, so it restarts the services that consume those files.
Verified by --check --diff against the live host. 24 changed items, and
every one is accounted for:
5 pre-existing, unchanged from the baseline before this work:
common timesyncd; open3e venv; E3onCAN venv; and the open3e /
e3oncan restart handlers. The venv tasks install from a git URL,
which pip cannot verify, so they report changed on every run --
a separate defect, not introduced here.
5 the compose split: zwave env + compose and sml compose to their
new paths, plus the two legacy-project retirement tasks.
14 the header repointing: journald conf, eMMC health script, alloy
config, mosquitto bridge config, 80-can0.network, open3e overlay /
env / unit, e3oncan unit, zwave backup script + env, sml2mqtt
config -- and the resulting restarts of journald, alloy, mosquitto,
open3e and e3oncan.
Nothing changed outside those three groups.
One consequence check mode cannot show: 80-can0.network.j2 changed, so the
"Reload networkd" handler fires on a real run and reconfigures can0,
briefly dropping the bus under open3e and e3oncan. It is absent from the
check-mode output only because shell handlers are skipped there. The VLAN
templates did NOT change, so the riskier reconfigure of the parent uplink
on this headless host is not triggered.
Also fixed in passing: the keepalived-ntp guard told operators to recover
with `--limit <host> --tags vlan40`, and referred to the edge-host role.
Both corrected. The role README becomes ansible/docs/edge-host.md -- it
documents the host, not any single role now.
Co-Authored-By: Claude Bot <claude-bot@renner.uno>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
58 lines
2.3 KiB
Django/Jinja
58 lines
2.3 KiB
Django/Jinja
# Managed by roles/mqtt-bridge. Local mosquitto that the edge clients (open3e,
|
|
# e3oncan, sml2mqtt) publish to over loopback; it bridges to the central
|
|
# cluster broker over TLS. open3e/e3oncan have no native MQTTS, so this is how
|
|
# edge-1's MQTT gets off plaintext on the untrusted IoT VLAN, and it buffers
|
|
# telemetry in RAM if the cluster broker is briefly unreachable.
|
|
#
|
|
# eMMC: this host runs on a small internal eMMC, so the local broker writes
|
|
# NOTHING to flash — `persistence false` keeps retained/queued messages in RAM
|
|
# only, and `log_dest stdout` goes to the (volatile, RAM) journal that Alloy
|
|
# ships to Loki. Do not add persistence/log-file settings here.
|
|
persistence false
|
|
log_dest stdout
|
|
log_type error
|
|
log_type warning
|
|
log_type notice
|
|
|
|
# Loopback only — the trust boundary is the host itself. Any process on edge-1
|
|
# may publish here (same trust as the bridged services); nothing off-host can
|
|
# reach it. Real authentication to the cluster happens on the bridge below.
|
|
# Single v4-loopback listener: all edge clients dial 127.0.0.1 (edge_mqtt_host),
|
|
# and a second same-port listener can make some builds refuse to start.
|
|
listener 1883 127.0.0.1
|
|
allow_anonymous true
|
|
|
|
# --- Bridge 1: open3e datapoints + command topic, as the cluster `open3e`
|
|
# user (its ACL is `readwrite open3e/#`, which covers publishing datapoints
|
|
# and subscribing to open3e/cmnd). e3oncan also publishes under open3e/#.
|
|
connection edge1-open3e
|
|
address {{ edge_mqtt_cluster_host }}:{{ edge_mqtt_cluster_tls_port }}
|
|
bridge_cafile {{ edge_mqtt_bridge_cafile }}
|
|
bridge_insecure false
|
|
remote_username {{ edge_open3e_mqtt_user }}
|
|
remote_password {{ edge_open3e_mqtt_password }}
|
|
remote_clientid edge1-bridge-open3e
|
|
cleansession false
|
|
try_private true
|
|
notifications false
|
|
restart_timeout 5 30
|
|
queue_qos0_messages true
|
|
topic open3e/# out 0
|
|
topic open3e/cmnd in 0
|
|
|
|
# --- Bridge 2: power-meter topics, as the cluster `sml2mqtt` user (ACL
|
|
# `write sml2mqtt/#`). Publish-only, so no `in` topics.
|
|
connection edge1-sml2mqtt
|
|
address {{ edge_mqtt_cluster_host }}:{{ edge_mqtt_cluster_tls_port }}
|
|
bridge_cafile {{ edge_mqtt_bridge_cafile }}
|
|
bridge_insecure false
|
|
remote_username sml2mqtt
|
|
remote_password {{ edge_sml2mqtt_mqtt_password }}
|
|
remote_clientid edge1-bridge-sml2mqtt
|
|
cleansession false
|
|
try_private true
|
|
notifications false
|
|
restart_timeout 5 30
|
|
queue_qos0_messages true
|
|
topic sml2mqtt/# out 0
|