diff --git a/hosts/server10/default.nix b/hosts/server10/default.nix index 07c98a04..e8d39795 100644 --- a/hosts/server10/default.nix +++ b/hosts/server10/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: { imports = [ @@ -67,6 +67,7 @@ keyfile = config.sops.secrets."ceph/osd.4/keyfile".path; deviceClass = "ssd"; } ]; + skyflake.storage.ceph.package = pkgs.ceph_17_2; system.stateVersion = "21.11"; # Did you read the comment? } diff --git a/hosts/server7/default.nix b/hosts/server7/default.nix index 2f06acf7..ab83eb04 100644 --- a/hosts/server7/default.nix +++ b/hosts/server7/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: { imports = [ @@ -57,6 +57,7 @@ keyfile = config.sops.secrets."ceph/osd.6/keyfile".path; deviceClass = "ssd"; } ]; + skyflake.storage.ceph.package = pkgs.ceph_16_2; system.stateVersion = "22.11"; } diff --git a/hosts/server8/default.nix b/hosts/server8/default.nix index c4286be3..1a440d9e 100644 --- a/hosts/server8/default.nix +++ b/hosts/server8/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: { imports = [ @@ -89,6 +89,7 @@ keyfile = config.sops.secrets."ceph/osd.2/keyfile".path; deviceClass = "hdd"; } ]; + skyflake.storage.ceph.package = pkgs.ceph_17_2; system.stateVersion = "22.11"; } diff --git a/hosts/server9/default.nix b/hosts/server9/default.nix index c8ba14d7..a522cbdf 100644 --- a/hosts/server9/default.nix +++ b/hosts/server9/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: { imports = [ @@ -58,6 +58,7 @@ keyfile = config.sops.secrets."ceph/osd.3/keyfile".path; deviceClass = "hdd"; } ]; + skyflake.storage.ceph.package = pkgs.ceph_17_2; system.stateVersion = "21.11"; diff --git a/modules/microvm-host.nix b/modules/microvm-host.nix index e3a94524..20e8faa3 100644 --- a/modules/microvm-host.nix +++ b/modules/microvm-host.nix @@ -8,6 +8,14 @@ }; config = { + # TODO: activate when we fixed the ceph + # assertions = [ + # { + # assertion = config.skyflake.storage.ceph.package != 17; + # message = "Please pin ceph to major version 17!"; + # } + # ]; + # just all the microvms from this flake that are supposed to run on the server microvm.autostart = builtins.filter (name: diff --git a/overlays/default.nix b/overlays/default.nix index 94c1dc63..d3688063 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -18,6 +18,8 @@ with final; { lua = lua5_4; }).ceph; + ceph_17 = assert (lib.versions.majorMinor ceph.version) == "17.2"; prev.ceph; + dex-oidc = prev.dex-oidc.override { buildGoModule = let ver = lib.versions.majorMinor prev.dex-oidc.version;