From c3c3614f6338875c82a101487ad823b0dc152b64 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Mon, 2 Jun 2025 09:07:32 +0200 Subject: [PATCH] Add tent machine from xeon04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We moved the tent machine to the server room in the BSC building and is now directly connected to the raccoon via NAT. Fixes: https://jungle.bsc.es/git/rarias/jungle/issues/106 Reviewed-by: Aleix Boné --- flake.nix | 1 + m/map.nix | 3 ++- m/raccoon/configuration.nix | 12 ++++++++++++ m/tent/configuration.nix | 38 +++++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 m/tent/configuration.nix diff --git a/flake.nix b/flake.nix index 037bba2c..67ae0875 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,7 @@ in { nixosConfigurations = { hut = mkConf "hut"; + tent = mkConf "tent"; owl1 = mkConf "owl1"; owl2 = mkConf "owl2"; eudy = mkConf "eudy"; diff --git a/m/map.nix b/m/map.nix index 6c310608..606d4171 100644 --- a/m/map.nix +++ b/m/map.nix @@ -17,7 +17,7 @@ owl1 = { pos=35; size=1; label="SSF-XEON01"; board="S2600WTTR"; sn="BQWL64954172"; contact="rodrigo.arias@bsc.es"; }; owl2 = { pos=34; size=1; label="SSF-XEON02"; board="S2600WTTR"; sn="BQWL64756560"; contact="rodrigo.arias@bsc.es"; }; xeon03 = { pos=33; size=1; label="SSF-XEON03"; board="S2600WTTR"; sn="BQWL64750826"; contact="rodrigo.arias@bsc.es"; }; - xeon04 = { pos=32; size=1; label="SSF-XEON04"; board="S2600WTTR"; sn="BQWL64751229"; contact="rodrigo.arias@bsc.es"; }; + # Slot 34 empty koro = { pos=31; size=1; label="SSF-XEON05"; board="S2600WTTR"; sn="BQWL64954293"; contact="rodrigo.arias@bsc.es"; }; xeon06 = { pos=30; size=1; label="SSF-XEON06"; board="S2600WTTR"; sn="BQWL64750846"; contact="antoni.navarro@bsc.es"; }; hut = { pos=29; size=1; label="SSF-XEON07"; board="S2600WTTR"; sn="BQWL64751184"; contact="rodrigo.arias@bsc.es"; }; @@ -48,6 +48,7 @@ bsc2218 = { raccoon = { board="W2600CR"; sn="QSIP22500829"; contact="rodrigo.arias@bsc.es"; }; + tent = { label="SSF-XEON04"; board="S2600WTTR"; sn="BQWL64751229"; contact="rodrigo.arias@bsc.es"; }; }; upc = { diff --git a/m/raccoon/configuration.nix b/m/raccoon/configuration.nix index 28d4da8f..3e70f4b5 100644 --- a/m/raccoon/configuration.nix +++ b/m/raccoon/configuration.nix @@ -26,6 +26,18 @@ address = "84.88.51.152"; prefixLength = 25; } ]; + interfaces.enp5s0f1.ipv4.addresses = [ { + address = "10.0.44.1"; + prefixLength = 24; + } ]; + nat = { + enable = true; + internalInterfaces = [ "enp5s0f1" ]; + externalInterface = "eno0"; + }; + hosts = { + "10.0.44.4" = [ "tent" ]; + }; }; nix.settings = { diff --git a/m/tent/configuration.nix b/m/tent/configuration.nix new file mode 100644 index 00000000..628ae39e --- /dev/null +++ b/m/tent/configuration.nix @@ -0,0 +1,38 @@ +{ config, pkgs, ... }: + +{ + imports = [ + ../common/xeon.nix + ../module/emulation.nix + ../module/debuginfod.nix + ]; + + # Select the this using the ID to avoid mismatches + boot.loader.grub.device = "/dev/disk/by-id/wwn-0x55cd2e414d537675"; + + networking = { + hostName = "tent"; + interfaces.eno1.ipv4.addresses = [ + { + address = "10.0.44.4"; + prefixLength = 24; + } + ]; + + # Only BSC DNSs seem to be reachable from the office VLAN + nameservers = [ "84.88.52.35" "84.88.52.36" ]; + defaultGateway = "10.0.44.1"; + }; + + nix.settings = { + extra-substituters = [ "https://jungle.bsc.es/cache" ]; + extra-trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; + }; + + services.prometheus.exporters.node = { + enable = true; + enabledCollectors = [ "systemd" ]; + port = 9002; + listenAddress = "127.0.0.1"; + }; +}