From e2aea648cf2e6c8b11d53d6149f9e9d161da6d3e Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 24 Mar 2023 14:32:39 +0100
Subject: greatly simplify ipv4 and ipv6 configuration

---
 cluster/staging/node/carcajou.nix | 8 ++++++--
 cluster/staging/node/caribou.nix  | 2 --
 cluster/staging/node/df-pw5.nix   | 5 +++--
 cluster/staging/node/origan.nix   | 3 +--
 cluster/staging/node/piranha.nix  | 3 +--
 5 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'cluster/staging/node')

diff --git a/cluster/staging/node/carcajou.nix b/cluster/staging/node/carcajou.nix
index e1bd3a6..5822f49 100644
--- a/cluster/staging/node/carcajou.nix
+++ b/cluster/staging/node/carcajou.nix
@@ -8,6 +8,12 @@
       ./remote-unlock.nix
     ];
 
+  deuxfleurs.remoteUnlock = {
+    networkInterface = "eno1";
+    staticIP = "192.168.1.22/24";
+    defaultGateway = "192.168.1.1";
+  };
+
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.timeout = 20;
@@ -15,8 +21,6 @@
 
   networking.hostName = "carcajou";
 
-  deuxfleurs.network_interface = "eno1";
-  deuxfleurs.lan_ip = "192.168.1.22";
   deuxfleurs.ipv6 = "2001:910:1204:1::22";
 
   deuxfleurs.cluster_ip = "10.14.1.2";
diff --git a/cluster/staging/node/caribou.nix b/cluster/staging/node/caribou.nix
index 02cb16d..2e8691a 100644
--- a/cluster/staging/node/caribou.nix
+++ b/cluster/staging/node/caribou.nix
@@ -10,8 +10,6 @@
 
   networking.hostName = "caribou";
 
-  deuxfleurs.network_interface = "eno1";
-  deuxfleurs.lan_ip = "192.168.1.23";
   deuxfleurs.ipv6 = "2001:910:1204:1::23";
 
   deuxfleurs.cluster_ip = "10.14.1.3";
diff --git a/cluster/staging/node/df-pw5.nix b/cluster/staging/node/df-pw5.nix
index 33888d6..356a2ae 100644
--- a/cluster/staging/node/df-pw5.nix
+++ b/cluster/staging/node/df-pw5.nix
@@ -11,10 +11,11 @@
 
   networking.hostName = "df-pw5";
 
-  deuxfleurs.network_interface = "eno1";
-  deuxfleurs.lan_ip = "192.168.5.130";
+  deuxfleurs.staticIPv4.address = "192.168.5.130/24";
   deuxfleurs.ipv6 = "2a02:a03f:6510:5102:223:24ff:feb0:e8a7";
 
   deuxfleurs.cluster_ip = "10.14.4.1";
   deuxfleurs.is_raft_server = false;
+
+  system.stateVersion = "22.11";
 }
diff --git a/cluster/staging/node/origan.nix b/cluster/staging/node/origan.nix
index 50bce58..6db7f87 100644
--- a/cluster/staging/node/origan.nix
+++ b/cluster/staging/node/origan.nix
@@ -10,8 +10,7 @@
 
   networking.hostName = "origan";
 
-  deuxfleurs.network_interface = "eno1";
-  deuxfleurs.lan_ip = "192.168.1.33";
+  deuxfleurs.staticIPv4.address = "192.168.1.33/24";
   deuxfleurs.ipv6 = "2a01:e0a:5e4:1d0:223:24ff:feaf:fdec";
 
   deuxfleurs.cluster_ip = "10.14.2.33";
diff --git a/cluster/staging/node/piranha.nix b/cluster/staging/node/piranha.nix
index 9ac2a07..4873693 100644
--- a/cluster/staging/node/piranha.nix
+++ b/cluster/staging/node/piranha.nix
@@ -10,8 +10,7 @@
 
   networking.hostName = "piranha";
 
-  deuxfleurs.network_interface = "eno1";
-  deuxfleurs.lan_ip = "192.168.1.25";
+  deuxfleurs.staticIPv4.address = "192.168.1.25/24";
   deuxfleurs.ipv6 = "2a01:cb05:8984:9900:223:24ff:feb0:ea82";
 
   deuxfleurs.cluster_ip = "10.14.3.1";
-- 
cgit v1.2.3