From 350d984e340cafd0f1bc18b1774e5dd675de4ad3 Mon Sep 17 00:00:00 2001 From: reachableceo Date: Thu, 27 Aug 2026 09:32:16 -0500 Subject: [PATCH] sync(dhcp): back-port live netinfra-01/02 dhcpd.conf to repo [#420] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The live configs were edited in place (canonical renames, stale block removal, 7 new reservations, 69 total) but the repo copies were never updated — the exact drift class that bit pi-hole. Repo and live state now match on both failover nodes. 💘 Generated with Crush Assisted-by: Crush:glm-5.2 EOF --- netinfra/dhcp/dhcpd-primary.conf | 33 +++--- netinfra/dhcp/dhcpd-secondary.conf | 181 ++++++++++++++++++++++++----- 2 files changed, 172 insertions(+), 42 deletions(-) diff --git a/netinfra/dhcp/dhcpd-primary.conf b/netinfra/dhcp/dhcpd-primary.conf index 6650ba9..5829095 100644 --- a/netinfra/dhcp/dhcpd-primary.conf +++ b/netinfra/dhcp/dhcpd-primary.conf @@ -69,11 +69,11 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet 74:5e:1c:76:e2:60; fixed-address 192.168.0.21; } - host ap-TableMount { + host ap-tablemount { hardware ethernet e0:63:da:36:73:39; fixed-address 192.168.3.54; } - host AP-WallMount { + host ap-wallmount { hardware ethernet e0:63:da:33:bb:1d; fixed-address 192.168.1.182; } @@ -81,7 +81,7 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet 00:60:2e:01:50:aa; fixed-address 192.168.3.56; } - host garagepdu { + host pfv-garage-pdu-1 { hardware ethernet 00:c0:b7:7e:49:78; fixed-address 192.168.3.18; } @@ -97,7 +97,7 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet 00:00:c0:34:0c:dc; fixed-address 192.168.1.166; } - host 3dscan { + host stlp-3dscanner { hardware ethernet b8:27:eb:91:31:82; fixed-address 192.168.0.4; } @@ -105,18 +105,14 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet 00:04:4b:e4:17:7b; fixed-address 192.168.3.186; } - host tsys7-oob { + host pfv-tsys7-oob { hardware ethernet f8:bc:12:35:1e:c6; fixed-address 192.168.3.197; } - host tsys6-oob { + host pfv-tsys6-oob { hardware ethernet a4:ba:db:0b:df:a0; fixed-address 192.168.3.196; } - host tsys-siem { - hardware ethernet 00:15:5d:64:e8:33; - fixed-address 192.168.3.81; - } host brother-label-printer { hardware ethernet 04:fe:a1:56:72:e2; fixed-address 192.168.3.52; @@ -149,10 +145,6 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet 34:17:eb:b3:b1:2d; fixed-address 192.168.3.11; } - host pfv-tsys2 { - hardware ethernet 18:fd:cb:00:d2:ca; - fixed-address 192.168.2.3; - } host pfv-tsys3 { hardware ethernet a4:4c:c8:08:d1:b8; fixed-address 192.168.2.5; @@ -188,7 +180,7 @@ subnet 192.168.0.0 netmask 255.255.252.0 { fixed-address 192.168.3.78; } # ultix-offstage - host ultix-offstge { + host ultix-offstage { hardware ethernet bc:24:11:1f:9d:83; fixed-address 192.168.3.79; } @@ -317,7 +309,16 @@ host pfv-r1-tor-top { hardware ethernet bc:24:11:fa:6e:b5; fixed-address 192.168.1.111; } - host tsys-siem-new { + host tsys-siem { hardware ethernet bc:24:11:ee:67:e2; fixed-address 192.168.1.223; } + +# --- added 2026-08-26, ticket #420 (missing reservations) --- +host pfv-k8s-wnode-tsys9 { hardware ethernet BC:24:11:EE:2B:B6; fixed-address 192.168.1.104; } +host stlpc-artroom { hardware ethernet ca:fe:0f:0e:b0:c3; fixed-address 192.168.3.87; } +host stlpc-garage { hardware ethernet 96:86:dd:1b:81:5a; fixed-address 192.168.0.100; } +host subopi3 { hardware ethernet b8:27:eb:11:47:b2; fixed-address 192.168.1.217; } +host subopi-dev-3 { hardware ethernet b8:27:eb:1b:35:95; fixed-address 192.168.1.232; } +host subopi-dev-4 { hardware ethernet dc:a6:32:d4:da:5e; fixed-address 192.168.1.231; } +host pfvsvrpi { hardware ethernet b8:27:eb:c2:f8:9f; fixed-address 192.168.1.230; } diff --git a/netinfra/dhcp/dhcpd-secondary.conf b/netinfra/dhcp/dhcpd-secondary.conf index 1947092..f70ffdf 100644 --- a/netinfra/dhcp/dhcpd-secondary.conf +++ b/netinfra/dhcp/dhcpd-secondary.conf @@ -1,8 +1,8 @@ -# dhcpd.conf — pfv-netinfra-02 (SECONDARY) +# dhcpd.conf — pfv-netinfra-01 (PRIMARY) # Migrated from pfv-netboot 2026-07-29 # Managed via Webmin DHCP module # -# FAILOVER: this node is SECONDARY; peer is pfv-netinfra-01 (192.168.3.252) +# FAILOVER: this node is PRIMARY; peer is pfv-netinfra-02 (192.168.3.253) # Global defaults option domain-name "knel.net"; @@ -15,7 +15,7 @@ max-lease-time 7200; ddns-update-style none; authoritative; -# ----- failover peer (SECONDARY) ----- +# ----- failover peer (PRIMARY) ----- failover peer "pfv-dhcp" { secondary; address 192.168.3.253; @@ -41,13 +41,13 @@ subnet 192.168.0.0 netmask 255.255.252.0 { range 192.168.0.1 192.168.3.200; } - # ---- host reservations (identical to primary) ---- + # ---- host reservations (fixed-address; not subject to failover pool) ---- - host pfv-r3-mgmt { + host pfv-r3-tor-mgmt-01 { hardware ethernet 00:14:22:69:1c:37; fixed-address 192.168.0.7; } - host pfv-r3-stor { + host pfv-r3-tor-stor-01 { hardware ethernet 00:13:72:46:95:e4; fixed-address 192.168.0.9; } @@ -55,7 +55,7 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet 40:9f:38:b0:b5:2f; fixed-address 192.168.1.84; } - host pfv-r2-tor1 { + host pfv-r2-tor-01 { hardware ethernet 00:0d:56:41:7a:4d; fixed-address 192.168.0.10; } @@ -67,11 +67,11 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet 74:5e:1c:76:e2:60; fixed-address 192.168.0.21; } - host ap-TableMount { + host ap-tablemount { hardware ethernet e0:63:da:36:73:39; fixed-address 192.168.3.54; } - host AP-WallMount { + host ap-wallmount { hardware ethernet e0:63:da:33:bb:1d; fixed-address 192.168.1.182; } @@ -79,7 +79,7 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet 00:60:2e:01:50:aa; fixed-address 192.168.3.56; } - host garagepdu { + host pfv-garage-pdu-1 { hardware ethernet 00:c0:b7:7e:49:78; fixed-address 192.168.3.18; } @@ -95,7 +95,7 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet 00:00:c0:34:0c:dc; fixed-address 192.168.1.166; } - host 3dscan { + host stlp-3dscanner { hardware ethernet b8:27:eb:91:31:82; fixed-address 192.168.0.4; } @@ -103,18 +103,14 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet 00:04:4b:e4:17:7b; fixed-address 192.168.3.186; } - host tsys7-oob { + host pfv-tsys7-oob { hardware ethernet f8:bc:12:35:1e:c6; fixed-address 192.168.3.197; } - host tsys6-oob { + host pfv-tsys6-oob { hardware ethernet a4:ba:db:0b:df:a0; fixed-address 192.168.3.196; } - host tsys-siem { - hardware ethernet 00:15:5d:64:e8:33; - fixed-address 192.168.3.81; - } host brother-label-printer { hardware ethernet 04:fe:a1:56:72:e2; fixed-address 192.168.3.52; @@ -147,10 +143,6 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet 34:17:eb:b3:b1:2d; fixed-address 192.168.3.11; } - host pfv-tsys2 { - hardware ethernet 18:fd:cb:00:d2:ca; - fixed-address 192.168.2.3; - } host pfv-tsys3 { hardware ethernet a4:4c:c8:08:d1:b8; fixed-address 192.168.2.5; @@ -175,11 +167,66 @@ subnet 192.168.0.0 netmask 255.255.252.0 { hardware ethernet a4:bb:6d:e3:56:86; fixed-address 192.168.3.58; } + # umbrel + host tsys-umbrel { + hardware ethernet 02:2E:FF:8E:A2:D2; + fixed-address 192.168.1.97; + } + # ultix-streaming + host ultix-streaming { + hardware ethernet bc:24:11:1a:8f:6f; + fixed-address 192.168.3.78; + } + # ultix-offstage + host ultix-offstage { + hardware ethernet bc:24:11:1f:9d:83; + fixed-address 192.168.3.79; + } + # ultix-highside + host ultix-highside { + hardware ethernet a0:4a:5e:ca:46:f3; + fixed-address 192.168.3.32; + } + # pfv-k8s-cnode1 + host pfv-k8s-cnode1 { + hardware ethernet bc:24:11:cb:97:10; + fixed-address 192.168.1.91; + } + # pfv-k8s-cnode2 + host pfv-k8s-cnode2 { + hardware ethernet bc:24:11:40:25:f8; + fixed-address 192.168.3.113; + } + # pfv-k8s-cnode3 + host pfv-k8s-cnode3 { + hardware ethernet bc:24:11:38:c0:58; + fixed-address 192.168.1.228; + } + # devbox-cloudron + host devbox-cloudron { + hardware ethernet bc:24:11:f7:b1:07; + fixed-address 192.168.1.6; + } + # hfnoc-uisp + host hfnoc-uisp { + hardware ethernet bc:24:11:a3:87:61; + fixed-address 192.168.3.193; + } + # kali-rd + host kali-rd { + hardware ethernet bc:24:11:9e:1c:e9; + fixed-address 192.168.2.37; + } + # kali-tsys + host kali-tsys { + hardware ethernet bc:24:11:16:22:d4; + fixed-address 192.168.1.114; + } } # ---- host declarations outside subnet (global scope, same as netboot) ---- -host subodev-torsw01 { +host pfv-r6-mgmt-01 { hardware ethernet 00:14:22:69:18:a7; fixed-address 192.168.0.8; } @@ -187,7 +234,89 @@ host pfv-r1-tor-top { hardware ethernet 00:23:ae:c1:ad:e8; fixed-address 192.168.0.11; } -host tailscale-router { - hardware ethernet bc:24:11:8a:69:04; - fixed-address 192.168.3.16; -} + +# --- VM DHCP reservations (generated 2026-08-11, ticket #420) --- +# All pinned to current ARP-observed IPs. No forward DNS needed +# (forward records point to Tailscale 100.x addresses). + + host tsys-ca { + hardware ethernet bc:24:11:32:d0:36; + fixed-address 192.168.1.181; + } + host pfv-netinfra-01 { + hardware ethernet bc:24:11:65:b2:ac; + fixed-address 192.168.3.252; + } + host pfv-netinfra-02 { + hardware ethernet bc:24:11:e4:37:53; + fixed-address 192.168.3.253; + } + host tsys-librenms { + hardware ethernet bc:24:11:5c:96:1e; + fixed-address 192.168.3.176; + } + host tsys-proxmox-datacenter { + hardware ethernet bc:24:11:e6:03:2d; + fixed-address 192.168.2.44; + } + host pfv-k8s-wnode-tsys3 { + hardware ethernet bc:24:11:ee:7e:7b; + fixed-address 192.168.1.98; + } + host pfv-proxmox-backup-server { + hardware ethernet bc:24:11:6e:12:69; + fixed-address 192.168.2.193; + } + host pfv-k8s-wnode-tsys5 { + hardware ethernet bc:24:11:c7:a8:6c; + fixed-address 192.168.1.5; + } + host preprod-hfnoc-uisp { + hardware ethernet bc:24:11:74:d6:8a; + fixed-address 192.168.3.192; + } + host tsys-awx { + hardware ethernet bc:24:11:80:0d:16; + fixed-address 192.168.3.115; + } + host pfv-rr-middleware-02 { + hardware ethernet bc:24:11:96:0e:ee; + fixed-address 192.168.1.117; + } + host tsys-proxmox-mailgw-01 { + hardware ethernet bc:24:11:56:61:18; + fixed-address 192.168.1.11; + } + host pfv-k8s-wnode-tsys7 { + hardware ethernet bc:24:11:30:b8:07; + fixed-address 192.168.1.109; + } + host pfv-rr-middleware-01 { + hardware ethernet bc:24:11:1e:61:cf; + fixed-address 192.168.1.110; + } + host tsys-voip { + hardware ethernet bc:24:11:23:ce:04; + fixed-address 192.168.1.70; + } + host tsys-proxmox-mailgw-02 { + hardware ethernet bc:24:11:5f:e5:2c; + fixed-address 192.168.1.10; + } + host pfv-k8s-wnode-tsys6 { + hardware ethernet bc:24:11:fa:6e:b5; + fixed-address 192.168.1.111; + } + host tsys-siem { + hardware ethernet bc:24:11:ee:67:e2; + fixed-address 192.168.1.223; + } + +# --- added 2026-08-26, ticket #420 (missing reservations) --- +host pfv-k8s-wnode-tsys9 { hardware ethernet BC:24:11:EE:2B:B6; fixed-address 192.168.1.104; } +host stlpc-artroom { hardware ethernet ca:fe:0f:0e:b0:c3; fixed-address 192.168.3.87; } +host stlpc-garage { hardware ethernet 96:86:dd:1b:81:5a; fixed-address 192.168.0.100; } +host subopi3 { hardware ethernet b8:27:eb:11:47:b2; fixed-address 192.168.1.217; } +host subopi-dev-3 { hardware ethernet b8:27:eb:1b:35:95; fixed-address 192.168.1.232; } +host subopi-dev-4 { hardware ethernet dc:a6:32:d4:da:5e; fixed-address 192.168.1.231; } +host pfvsvrpi { hardware ethernet b8:27:eb:c2:f8:9f; fixed-address 192.168.1.230; }