From 34c55f27ca68e9f742eb9c0b836695ffc3676270 Mon Sep 17 00:00:00 2001 From: beatzaplenty Date: Mon, 27 Jul 2026 06:18:42 +1000 Subject: [PATCH] test-lab/ha: nixpkgs-fmt formatting Co-Authored-By: Claude Sonnet 4.6 --- test-lab/ha/common.nix | 30 +++++++++++++++--------------- test-lab/ha/node1.nix | 2 +- test-lab/ha/node2.nix | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test-lab/ha/common.nix b/test-lab/ha/common.nix index 1cc4f00..9b6a00e 100644 --- a/test-lab/ha/common.nix +++ b/test-lab/ha/common.nix @@ -206,18 +206,18 @@ in # ── Packages ────────────────────────────────────────────────────────── environment.systemPackages = with pkgs; [ # HA stack - corosync # corosync-cfgtool, corosync-quorumtool - pacemaker # crm_mon, crm_resource, cibadmin, crm_attribute, pcs CLI - drbd # drbdadm, drbdsetup, drbdmon - ocf-resource-agents # OCF heartbeat agents (Filesystem, IPaddr2, drbd, …) + corosync # corosync-cfgtool, corosync-quorumtool + pacemaker # crm_mon, crm_resource, cibadmin, crm_attribute, pcs CLI + drbd # drbdadm, drbdsetup, drbdmon + ocf-resource-agents # OCF heartbeat agents (Filesystem, IPaddr2, drbd, …) # Storage - xfsprogs # mkfs.xfs, xfs_admin, xfs_info - targetcli-fb # targetcli shell + targetctl + xfsprogs # mkfs.xfs, xfs_admin, xfs_info + targetcli-fb # targetcli shell + targetctl # Networking / debug - iproute2 # ip, ss - iputils # ping + iproute2 # ip, ss + iputils # ping tcpdump lsof @@ -233,16 +233,16 @@ in networking.firewall = { enable = true; allowedTCPPorts = [ - 22 # SSH - 3260 # iSCSI - 3121 # pacemaker-remoted - 2224 # pcsd + 22 # SSH + 3260 # iSCSI + 3121 # pacemaker-remoted + 2224 # pcsd drbdPort # DRBD replication ]; allowedUDPPorts = [ - 5404 # corosync cluster - 5405 # corosync cluster - 5407 # corosync crypto + 5404 # corosync cluster + 5405 # corosync cluster + 5407 # corosync crypto ]; # Corosync uses ports 5404-5407 UDP; allow them on the cluster net extraCommands = '' diff --git a/test-lab/ha/node1.nix b/test-lab/ha/node1.nix index a7d408c..6baf756 100644 --- a/test-lab/ha/node1.nix +++ b/test-lab/ha/node1.nix @@ -3,7 +3,7 @@ # ha-test-node1: VMID 200, 192.168.2.200/24 { networking.hostName = "ha-test-node1"; - networking.hostId = "a1b2c3d4"; # random, required by ZFS (not used here) but harmless + networking.hostId = "a1b2c3d4"; # random, required by ZFS (not used here) but harmless networking.interfaces.ens18.ipv4.addresses = [{ address = "192.168.2.200"; diff --git a/test-lab/ha/node2.nix b/test-lab/ha/node2.nix index 72dcafc..bf49d4b 100644 --- a/test-lab/ha/node2.nix +++ b/test-lab/ha/node2.nix @@ -3,7 +3,7 @@ # ha-test-node2: VMID 201, 192.168.2.201/24 { networking.hostName = "ha-test-node2"; - networking.hostId = "e5f6a7b8"; # random, required by ZFS (not used here) but harmless + networking.hostId = "e5f6a7b8"; # random, required by ZFS (not used here) but harmless networking.interfaces.ens18.ipv4.addresses = [{ address = "192.168.2.201";