From 2a1459d887e8b93d0ba72f4184b8fdbe39217766 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 24 Aug 2022 00:07:08 +0200
Subject: [PATCH] Reaffect wireguard IPs in staging cluster

---
 cluster/staging/cluster.nix       | 12 ++++++------
 cluster/staging/node/carcajou.nix |  2 +-
 cluster/staging/node/cariacou.nix |  2 +-
 cluster/staging/node/caribou.nix  |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index d71b274..c1036cb 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -12,7 +12,7 @@
       hostname = "cariacou";
       site_name = "neptune";
       publicKey = "qxrtfn2zRVnN52Y5NYumyU3/FcRMnh3kJ2C37JfrczA=";
-      IP = "10.14.179.56";
+      IP = "10.14.1.1";
       lan_endpoint = "192.168.1.21:33799";
       endpoint = "192.168.1.21:33799"; ## TODO nat
     }
@@ -20,7 +20,7 @@
       hostname = "carcajou";
       site_name = "neptune";
       publicKey = "7Nm7pMmyS7Nts1MB+loyD8u84ODxHPTkDu+uqQR6yDk=";
-      IP = "10.14.252.121";
+      IP = "10.14.1.2";
       lan_endpoint = "192.168.1.22:33799";
       endpoint = "192.168.1.22:33799";	 ## TODO nat
     }
@@ -28,7 +28,7 @@
       hostname = "caribou";
       site_name = "neptune";
       publicKey = "X1OlfgjZDdJw3yTg0ytGFlJZXzqT0yHJmYP15R9IpD8=";
-      IP = "10.14.181.82";
+      IP = "10.14.1.3";
       lan_endpoint = "192.168.1.23:33799";
       endpoint = "192.168.1.23:33799";	 ## TODO nat
     }
@@ -37,9 +37,9 @@
   # Bootstrap IPs for Consul cluster,
   # these are IPs on the Wesher overlay
   services.consul.extraConfig.retry_join = [
-    "10.14.181.82"  # caribou
-    "10.14.179.56"  # cariacou
-    "10.14.252.121" # carcajou
+    "10.14.1.1"  # cariacou
+    "10.14.1.2" # carcajou
+    "10.14.1.3"  # caribou
   ];
 
   deuxfleurs.admin_accounts = {
diff --git a/cluster/staging/node/carcajou.nix b/cluster/staging/node/carcajou.nix
index 2607cdd..f7d9001 100644
--- a/cluster/staging/node/carcajou.nix
+++ b/cluster/staging/node/carcajou.nix
@@ -19,7 +19,7 @@
   deuxfleurs.lan_ip = "192.168.1.22";
   deuxfleurs.ipv6 = "2a06:a004:3025:1::22";
 
-  deuxfleurs.cluster_ip = "10.14.252.121";
+  deuxfleurs.cluster_ip = "10.14.1.2";
   deuxfleurs.is_raft_server = true;
 
   # Enable netdata monitoring
diff --git a/cluster/staging/node/cariacou.nix b/cluster/staging/node/cariacou.nix
index aafdf6e..1f237ab 100644
--- a/cluster/staging/node/cariacou.nix
+++ b/cluster/staging/node/cariacou.nix
@@ -19,7 +19,7 @@
   deuxfleurs.lan_ip = "192.168.1.21";
   deuxfleurs.ipv6 = "2a06:a004:3025:1::21";
 
-  deuxfleurs.cluster_ip = "10.14.179.56";
+  deuxfleurs.cluster_ip = "10.14.1.1";
   deuxfleurs.is_raft_server = true;
 
   # Enable netdata monitoring
diff --git a/cluster/staging/node/caribou.nix b/cluster/staging/node/caribou.nix
index 062cc0a..d24ace6 100644
--- a/cluster/staging/node/caribou.nix
+++ b/cluster/staging/node/caribou.nix
@@ -19,7 +19,7 @@
   deuxfleurs.lan_ip = "192.168.1.23";
   deuxfleurs.ipv6 = "2a06:a004:3025:1::23";
 
-  deuxfleurs.cluster_ip = "10.14.181.82";
+  deuxfleurs.cluster_ip = "10.14.1.3";
   deuxfleurs.is_raft_server = true;
 
   # Enable netdata monitoring