diff --git a/hosts/prometheus/default.nix b/hosts/prometheus/default.nix index c290d3ba..b078318c 100644 --- a/hosts/prometheus/default.nix +++ b/hosts/prometheus/default.nix @@ -77,7 +77,6 @@ labels.__meta_net = "net-flpk"; } { targets = fromNet "cluster" (host: builtins.elem host [ - "server8" "server9" "server10" ]); diff --git a/modules/cluster/default.nix b/modules/cluster/default.nix index 88cb2cb3..f219919f 100644 --- a/modules/cluster/default.nix +++ b/modules/cluster/default.nix @@ -1,13 +1,13 @@ -{ config, hostRegistry, is2305, lib, pkgs, ssh-public-keys, zentralwerk, ... }: +{ config, hostRegistry, lib, pkgs, ssh-public-keys, zentralwerk, ... }: let inherit (config.networking) hostName; # hydra does *not* use this module because it only runs a nomad # server but no client and no microvms - servers = [ "server8" "server9" "server10" "hydra" ]; - microvmServers = [ "server8" "server9" "server10" ]; - storageServers = [ "server8" "server9" ]; + servers = [ "server9" "server10" "hydra" ]; + microvmServers = [ "server9" "server10" ]; + storageServers = [ "server9" ]; serverNet = server: builtins.foldl' (result: net: @@ -86,7 +86,7 @@ in { storage.ceph = rec { package = pkgs.ceph_17_2; fsid = "a06b1061-ef09-46d6-a15f-2f8ce4d7d1bf"; - mons = [ "server8" "server9" "server10" ]; + mons = [ "server9" "server10" ]; mgrs = mons; mdss = mons; rbdPools.microvms = {