staging: remove node carcajou

6 files changed, 3 insertions, 40 deletions

diff --git a/cluster/staging/app/telemetry/deploy/telemetry-service.hcl b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
index b09796a..c1d2cf3 100644
--- a/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
+++ b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
@@ -14,7 +14,7 @@ job "telemetry-service" {
     constraint {
       attribute = "${attr.unique.hostname}"
       operator = "set_contains_any"
-      value = "carcajou,origan"
+      value = "df-pw5,origan"
     }
 
     task "prometheus" {
diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index 7addac3..9080605 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -7,12 +7,6 @@
   deuxfleurs.clusterPrefix = "10.14.0.0/16";
 
   deuxfleurs.clusterNodes = {
-    "carcajou" = {
-      siteName = "neptune";
-      publicKey = "7Nm7pMmyS7Nts1MB+loyD8u84ODxHPTkDu+uqQR6yDk=";
-      address = "10.14.1.2";
-      endpoint = "77.207.15.215:33722";
-    };
     "caribou" = {
       siteName = "neptune";
       publicKey = "lABn/axzD1jkFulX8c+K3B3CbKXORlIMDDoe8sQVxhs=";
diff --git a/cluster/staging/node/carcajou.nix b/cluster/staging/node/carcajou.nix
deleted file mode 100644
index 3d33feb..0000000
--- a/cluster/staging/node/carcajou.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration file local to this node
-
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [
-      ./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;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  deuxfleurs.hostName = "carcajou";
-  deuxfleurs.staticIPv6.address = "2001:910:1204:1::22";
-  deuxfleurs.isRaftServer = true;
-
-  system.stateVersion = "21.05";
-}
diff --git a/cluster/staging/node/carcajou.site.nix b/cluster/staging/node/carcajou.site.nix
deleted file mode 120000
index 04ee36c..0000000
--- a/cluster/staging/node/carcajou.site.nix
+++ /dev/null
@@ -1 +0,0 @@
-../site/neptune.nix
\ No newline at end of file
diff --git a/cluster/staging/node/caribou.nix b/cluster/staging/node/caribou.nix
index f68d1dd..80293e9 100644
--- a/cluster/staging/node/caribou.nix
+++ b/cluster/staging/node/caribou.nix
@@ -10,6 +10,7 @@
 
   deuxfleurs.hostName = "caribou";
   deuxfleurs.staticIPv6.address = "2001:910:1204:1::23";
+  deuxfleurs.isRaftServer = true;
 
   system.stateVersion = "21.05";
 }
diff --git a/cluster/staging/ssh_config b/cluster/staging/ssh_config
index 54c0f01..607a08c 100644
--- a/cluster/staging/ssh_config
+++ b/cluster/staging/ssh_config
@@ -4,10 +4,6 @@ Host caribou
 	#HostName caribou.machine.deuxfleurs.fr
 	HostName caribou.machine.staging.deuxfleurs.org
 
-Host carcajou
-	#HostName carcajou.machine.deuxfleurs.fr
-	HostName carcajou.machine.staging.deuxfleurs.org
-
 Host origan
 	#HostName origan.df.trinity.fr.eu.org
 	HostName origan.machine.staging.deuxfleurs.org
@@ -15,7 +11,7 @@ Host origan
 Host piranha
 	#HostName piranha.polyno.me
 	#OR
-	#ProxyJump carcajou.machine.deuxfleurs.fr
+	#ProxyJump caribou.machine.deuxfleurs.fr
 	#HostName 10.14.3.1
 	HostName piranha.machine.staging.deuxfleurs.org