aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-01-04 17:06:39 +0100
committerAlex Auvolat <alex@adnab.me>2023-01-04 17:06:39 +0100
commit9fabb5844affbce371c4b3e6fbad8071a0a7f255 (patch)
tree431ea629eeea6f00677470e211413c000912ebff
parent3a8588a1ea5878b54d93346b14a6028683644b87 (diff)
downloadnixcfg-9fabb5844affbce371c4b3e6fbad8071a0a7f255.tar.gz
nixcfg-9fabb5844affbce371c4b3e6fbad8071a0a7f255.zip
staging: remove node cariacou, update garage
-rw-r--r--cluster/staging/app/garage/deploy/garage.hcl2
-rw-r--r--cluster/staging/app/telemetry/deploy/telemetry-service.hcl2
-rw-r--r--cluster/staging/cluster.nix8
-rw-r--r--cluster/staging/node/cariacou.nix26
l---------cluster/staging/node/cariacou.site.nix1
-rw-r--r--cluster/staging/node/caribou.nix2
-rw-r--r--cluster/staging/ssh_config3
7 files changed, 3 insertions, 41 deletions
diff --git a/cluster/staging/app/garage/deploy/garage.hcl b/cluster/staging/app/garage/deploy/garage.hcl
index 4e9d047..f9b8a66 100644
--- a/cluster/staging/app/garage/deploy/garage.hcl
+++ b/cluster/staging/app/garage/deploy/garage.hcl
@@ -25,7 +25,7 @@ job "garage-staging" {
config {
packages = [
"#bash", # so that we can enter a shell inside container
- "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?ref=interrupted-cleanup&rev=0650a43cf14e7e52121a553130a9ea6c92b7bd4a",
+ "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?ref=main&rev=02e8eb167efa1f08d69fe7f8e6192cde726c45aa",
]
command = "garage"
args = [ "server" ]
diff --git a/cluster/staging/app/telemetry/deploy/telemetry-service.hcl b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl
index 9785c96..c3b0b50 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 = "cariacou,origan"
+ value = "carcajou,origan"
}
task "prometheus" {
diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index c794298..7e31bcf 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -9,14 +9,6 @@
deuxfleurs.cluster_nodes = [
{
- hostname = "cariacou";
- site_name = "neptune";
- publicKey = "qxrtfn2zRVnN52Y5NYumyU3/FcRMnh3kJ2C37JfrczA=";
- IP = "10.14.1.1";
- lan_endpoint = "192.168.1.21:33799";
- endpoint = "77.207.15.215:33721";
- }
- {
hostname = "carcajou";
site_name = "neptune";
publicKey = "7Nm7pMmyS7Nts1MB+loyD8u84ODxHPTkDu+uqQR6yDk=";
diff --git a/cluster/staging/node/cariacou.nix b/cluster/staging/node/cariacou.nix
deleted file mode 100644
index d8fe564..0000000
--- a/cluster/staging/node/cariacou.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# Configuration file local to this node
-
-{ config, pkgs, ... }:
-
-{
- imports =
- [
- ./remote-unlock.nix
- ];
-
- # Use the systemd-boot EFI boot loader.
- boot.loader.systemd-boot.enable = true;
- boot.loader.timeout = 20;
- boot.loader.efi.canTouchEfiVariables = true;
-
- networking.hostName = "cariacou";
-
- deuxfleurs.network_interface = "eno1";
- deuxfleurs.lan_ip = "192.168.1.21";
- deuxfleurs.ipv6 = "2001:910:1204:1::21";
-
- deuxfleurs.cluster_ip = "10.14.1.1";
- deuxfleurs.is_raft_server = true;
-
- system.stateVersion = "21.05";
-}
diff --git a/cluster/staging/node/cariacou.site.nix b/cluster/staging/node/cariacou.site.nix
deleted file mode 120000
index 04ee36c..0000000
--- a/cluster/staging/node/cariacou.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 f777e73..02cb16d 100644
--- a/cluster/staging/node/caribou.nix
+++ b/cluster/staging/node/caribou.nix
@@ -15,7 +15,7 @@
deuxfleurs.ipv6 = "2001:910:1204:1::23";
deuxfleurs.cluster_ip = "10.14.1.3";
- deuxfleurs.is_raft_server = false;
+ deuxfleurs.is_raft_server = true;
system.stateVersion = "21.05";
}
diff --git a/cluster/staging/ssh_config b/cluster/staging/ssh_config
index 36c5803..b1a02e8 100644
--- a/cluster/staging/ssh_config
+++ b/cluster/staging/ssh_config
@@ -6,9 +6,6 @@ Host caribou
Host carcajou
HostName carcajou.machine.deuxfleurs.fr
-Host cariacou
- HostName cariacou.machine.deuxfleurs.fr
-
Host origan
HostName origan.df.trinity.fr.eu.org