diff --git a/cluster/machines/bc01n01.hswaw.net.nix b/cluster/machines/bc01n01.hswaw.net.nix index defcbca8..8dd756da 100644 --- a/cluster/machines/bc01n01.hswaw.net.nix +++ b/cluster/machines/bc01n01.hswaw.net.nix @@ -26,12 +26,6 @@ rec { podNet = "10.10.16.0/24"; }; - hscloud.ceph = { - name = "k0"; - fsid = "74592dc2-31b7-4dbe-88cf-40459dfeb354"; - enable = true; - }; - environment.systemPackages = [ pkgs.shadow ]; diff --git a/cluster/machines/bc01n02.hswaw.net.nix b/cluster/machines/bc01n02.hswaw.net.nix index 43b61d08..904ef1bc 100644 --- a/cluster/machines/bc01n02.hswaw.net.nix +++ b/cluster/machines/bc01n02.hswaw.net.nix @@ -25,12 +25,5 @@ rec { data.enable = true; data.podNet = "10.10.17.0/24"; }; - - hscloud.ceph = { - name = "k0"; - fsid = "74592dc2-31b7-4dbe-88cf-40459dfeb354"; - - control.enable = true; - }; } diff --git a/cluster/machines/dcr01s22.hswaw.net.nix b/cluster/machines/dcr01s22.hswaw.net.nix index 742a5413..9cb247f5 100644 --- a/cluster/machines/dcr01s22.hswaw.net.nix +++ b/cluster/machines/dcr01s22.hswaw.net.nix @@ -25,17 +25,5 @@ rec { data.enable = true; data.podNet = "10.10.19.0/24"; }; - - hscloud.ceph = { - name = "k0"; - fsid = "74592dc2-31b7-4dbe-88cf-40459dfeb354"; - - osd.devices = [ - { id = 0; path = "/dev/disk/by-id/scsi-35000c500850293e3"; uuid = "314034c5-474c-4d0d-ba41-36a881c52560";} - { id = 1; path = "/dev/disk/by-id/scsi-35000c500850312cb"; uuid = "a7f1baa0-0fc3-4ab1-9895-67abdc29de03";} - { id = 2; path = "/dev/disk/by-id/scsi-35000c5008508e3ef"; uuid = "11ac8316-6a87-48a7-a0c7-74c3cef6c2fa";} - { id = 3; path = "/dev/disk/by-id/scsi-35000c5008508e23f"; uuid = "c6b838d1-b08c-4788-936c-293041ed2d4d";} - ]; - }; } diff --git a/cluster/machines/dcr01s24.hswaw.net.nix b/cluster/machines/dcr01s24.hswaw.net.nix index c3ad18e6..9d7da4fd 100644 --- a/cluster/machines/dcr01s24.hswaw.net.nix +++ b/cluster/machines/dcr01s24.hswaw.net.nix @@ -25,17 +25,5 @@ rec { data.enable = true; data.podNet = "10.10.20.0/24"; }; - - hscloud.ceph = { - name = "k0"; - fsid = "74592dc2-31b7-4dbe-88cf-40459dfeb354"; - - osd.devices = [ - { id = 4; path = "/dev/disk/by-id/scsi-35000c5008509199b"; uuid = "a2b4663d-bd8f-49b3-b0b0-195c56ba252f";} - { id = 5; path = "/dev/disk/by-id/scsi-35000c50085046abf"; uuid = "a2242989-ccce-4367-8813-519b64b5afdb";} - { id = 6; path = "/dev/disk/by-id/scsi-35000c5008502929b"; uuid = "7deac89c-22dd-4c2b-b3cc-43ff7f990fd6";} - { id = 7; path = "/dev/disk/by-id/scsi-35000c5008502a323"; uuid = "e305ebb3-9cac-44d2-9f1d-bbb72c8ab51f";} - ]; - }; } diff --git a/ops/machines.nix b/ops/machines.nix index 7261ce8b..10b5d4fc 100644 --- a/ops/machines.nix +++ b/ops/machines.nix @@ -19,28 +19,7 @@ let repo = "nixpkgs-channels"; rev = "44ad80ab1036c5cc83ada4bfa451dac9939f2a10"; sha256 = "1b61nzvy0d46cspy07szkc0rggacxiqg9v1py27pkqpj7rvawfsk"; - }) { - overlays = [ - (self: super: rec { - # Use a newer version of Ceph (16, Pacific, EOL 2023-06-01) than in - # this nixpkgs (15, Octopus, EOL 2022-06-01). - # - # This is to: - # 1. Fix a bug in which ceph-volume lvm create fails due to a rocksdb - # mismatch (https://tracker.ceph.com/issues/49815) - # 2. At the time of deployment not start out with an ancient version - # of Ceph. - # - # Once we unpin nixpkgsCluster past a version that contains this Ceph, - # this can be unoverlayed. - inherit (super.callPackages ./ceph { - boost = super.boost17x.override { enablePython = true; python = super.python3; }; - lua = super.lua5_4; - }) ceph ceph-client; - ceph-lib = ceph.lib; - }) - ]; - }; + }) { }; # mkMachine builds NixOS modules into a NixOS derivation. # It: @@ -112,7 +91,6 @@ let ../cluster/machines/modules/base.nix ../cluster/machines/modules/kube-controlplane.nix ../cluster/machines/modules/kube-dataplane.nix - ../cluster/machines/modules/ceph.nix path ]; @@ -120,7 +98,6 @@ let ../cluster/machines/modules/base.nix ../cluster/machines/modules/kube-controlplane.nix ../cluster/machines/modules/kube-dataplane.nix - ../cluster/machines/modules/ceph.nix path ];