From 15e7348a0bd8fed7f2aafea49ca1a039415cb43b Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Mon, 1 Jul 2024 11:32:29 +0200 Subject: [PATCH] cluster: remove dead machines Change-Id: I3ff6680bc7212341ca626b0f560e1fe93efe3a35 Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1987 Reviewed-by: ar --- cluster/machines/bc01n01.hswaw.net.nix | 33 -------- cluster/machines/bc01n02.hswaw.net.nix | 29 ------- cluster/machines/bc01n05.hswaw.net.nix | 101 ------------------------- ops/hive.nix | 4 - 4 files changed, 167 deletions(-) delete mode 100644 cluster/machines/bc01n01.hswaw.net.nix delete mode 100644 cluster/machines/bc01n02.hswaw.net.nix delete mode 100644 cluster/machines/bc01n05.hswaw.net.nix diff --git a/cluster/machines/bc01n01.hswaw.net.nix b/cluster/machines/bc01n01.hswaw.net.nix deleted file mode 100644 index a753e9f3..00000000 --- a/cluster/machines/bc01n01.hswaw.net.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ config, pkgs, ... }: - -with builtins; - -rec { - networking.hostName = "bc01n01"; - # TODO: undefine fqdn and define domain after big nix change - hscloud.base.fqdn = "${networking.hostName}.hswaw.net"; - #networking.domain = "hswaw.net"; - system.stateVersion = "18.09"; - nix.maxJobs = 16; - - boot.loader.grub.device = "/dev/disk/by-id/scsi-360024e8078a9060023b1043107388af5"; - fileSystems."/".device = "/dev/disk/by-uuid/518ecac1-00ea-4ef0-9418-9eca6ce6d918"; - - hscloud.base = { - mgmtIf = "eno1"; - ipAddr = "185.236.240.35"; - ipAddrBits = 28; - gw = "185.236.240.33"; - }; - - hscloud.kube.control.enable = false; - hscloud.kube.data = { - enable = false; - podNet = "10.10.16.0/24"; - }; - - environment.systemPackages = [ - pkgs.shadow - ]; -} - diff --git a/cluster/machines/bc01n02.hswaw.net.nix b/cluster/machines/bc01n02.hswaw.net.nix deleted file mode 100644 index 12366b20..00000000 --- a/cluster/machines/bc01n02.hswaw.net.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, pkgs, ... }: - -with builtins; - -rec { - networking.hostName = "bc01n02"; - # TODO: undefine fqdn and define domain after big nix change - hscloud.base.fqdn = "${networking.hostName}.hswaw.net"; - #networking.domain = "hswaw.net"; - system.stateVersion = "18.09"; - nix.maxJobs = 16; - - boot.loader.grub.device = "/dev/disk/by-id/scsi-360024e8078b0250023b10f8706d3c99e"; - fileSystems."/".device = "/dev/disk/by-uuid/2d45c87b-029b-463e-a7cb-afd5a3089327"; - - hscloud.base = { - mgmtIf = "eno1"; - ipAddr = "185.236.240.36"; - ipAddrBits = 28; - gw = "185.236.240.33"; - }; - - hscloud.kube = { - control.enable = false; - data.enable = false; - data.podNet = "10.10.17.0/24"; - }; -} - diff --git a/cluster/machines/bc01n05.hswaw.net.nix b/cluster/machines/bc01n05.hswaw.net.nix deleted file mode 100644 index 3155cc96..00000000 --- a/cluster/machines/bc01n05.hswaw.net.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ config, pkgs, lib, ... }: - -with builtins; -let - postgresPkg = pkgs.postgresql_14; - numCPUs = 16; -in rec { - networking.hostName = "bc01n05"; - # TODO: undefine fqdn and define domain after big nix change - hscloud.base.fqdn = "${networking.hostName}.hswaw.net"; - #networking.domain = "hswaw.net"; - system.stateVersion = "22.05"; - nix.maxJobs = numCPUs; - - ### zfs - # randomly generated - networking.hostId = "26dbfbcd"; - boot.supportedFilesystems = [ "zfs" ]; - boot.initrd.supportedFilesystems = [ "zfs" ]; - services.zfs.trim.enable = true; - - boot.loader.grub.device = "/dev/sda"; - fileSystems = { - "/" = { - device = "rpool/nixos/root"; - fsType = lib.mkForce "zfs"; - options = [ "X-mount.mkdir" ]; - }; - "/home" = { - device = "rpool/nixos/home"; - fsType = "zfs"; - options = [ "X-mount.mkdir" ]; - }; - "/var/lib/postgresql" = { - device = "rpool/postgres"; - fsType = "zfs"; - options = [ "X-mount.mkdir" ]; - }; - "/boot" = { - device = "/dev/disk/by-uuid/2a951c5d-0193-4ef3-9227-d8a5184cbd63"; - fsType = "ext4"; - }; - }; - - hscloud.base = { - mgmtIf = "eno1"; - ipAddr = "185.236.240.37"; - ipAddrBits = 28; - gw = "185.236.240.33"; - }; - - networking.firewall.allowedTCPPorts = [ config.services.postgresql.port ]; - - environment.systemPackages = [postgresPkg]; - services.postgresql = { - enable = true; - package = postgresPkg; - enableTCPIP = true; - initdbArgs = ["--encoding='UTF8'" "--lc-collate='C'" "--lc-ctype='C'"]; - settings = { - max_connections = 300; - shared_buffers = "8GB"; - temp_buffers = "128MB"; - work_mem = "128MB"; - maintenance_work_mem = "258MB"; - effective_io_concurrency = 10; # ssd, guess - maintenance_io_concurrency = 100; # ssd, guess - max_worker_processes = numCPUs; - max_parallel_workers = numCPUs; - max_parallel_maintenance_workers = 4; - wal_level = "logical"; - wal_sync_method = "fsync"; # slightly faster (per pg_test_fsync) AND safer - full_page_writes = "off"; # partial writes impossible on zfs - wal_init_zero = "off"; # useless on CoW - wal_recycle = "off"; # same - random_page_cost = 2.0; # ssd, TODO maybe even lower? - }; - ensureDatabases = ["synapse" "mediarepo"]; - ensureUsers = [ - { - name = "synapse"; - ensurePermissions = { - "DATABASE synapse" = "ALL PRIVILEGES"; - }; - } - { - name = "mediarepo"; - ensurePermissions = { - "DATABASE mediarepo" = "ALL PRIVILEGES"; - }; - } - ]; - authentication = pkgs.lib.mkOverride 10 '' - local all all trust - host all all 127.0.0.1/32 trust - host all all ::1/128 trust - host synapse,mediarepo synapse,mediarepo 185.236.240.0/24 scram-sha-256 - ''; - }; -} - diff --git a/ops/hive.nix b/ops/hive.nix index c377a2e8..6c61e2c0 100644 --- a/ops/hive.nix +++ b/ops/hive.nix @@ -56,8 +56,6 @@ in nixpkgs = pkgs; nodeNixpkgs = { - "bc01n01.hswaw.net" = nixpkgsMachines; - "bc01n05.hswaw.net" = nixpkgsMachines; "dcr01s22.hswaw.net" = nixpkgsMachines; "dcr01s24.hswaw.net" = nixpkgsMachines; "dcr03s16.hswaw.net" = nixpkgsMachines; @@ -115,8 +113,6 @@ in _module.args.machines = nodes; }; - "bc01n01.hswaw.net" = mkClusterMachine ../cluster/machines/bc01n01.hswaw.net.nix; - "bc01n05.hswaw.net" = mkClusterMachine ../cluster/machines/bc01n05.hswaw.net.nix; "dcr01s22.hswaw.net" = mkClusterMachine ../cluster/machines/dcr01s22.hswaw.net.nix; "dcr01s24.hswaw.net" = mkClusterMachine ../cluster/machines/dcr01s24.hswaw.net.nix; "dcr03s16.hswaw.net" = mkClusterMachine ../cluster/machines/dcr03s16.hswaw.net.nix;