summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2023-06-14 19:18:49 +0200
committerSandro Jäckel <sandro.jaeckel@gmail.com>2023-06-14 19:20:10 +0200
commitd64e1f0b405bee479b191cdde71ddfdce2c4387d (patch)
tree2488c4cbf52d202732cb96ae8db0358f0c3ad629
parente1fedfdf455e381d2657c84fe4ea41478d5a5479 (diff)
nixos/ceph: add options to configure package used by each component
This makes updates following the upstream guide possible.
-rw-r--r--nixos/modules/services/network-filesystems/ceph.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index 642c2b2de3e0..aad03728b203 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -11,7 +11,7 @@ let
makeServices = daemonType: daemonIds:
mkMerge (map (daemonId:
- { "ceph-${daemonType}-${daemonId}" = makeService daemonType daemonId cfg.global.clusterName pkgs.ceph; })
+ { "ceph-${daemonType}-${daemonId}" = makeService daemonType daemonId cfg.global.clusterName cfg.${daemonType}.package; })
daemonIds);
makeService = daemonType: daemonId: clusterName: ceph:
@@ -210,6 +210,7 @@ in
to the id part in ceph i.e. [ "name1" ] would result in mgr.name1
'';
};
+ package = mkPackageOptionMD pkgs "ceph" { };
extraConfig = mkOption {
type = with types; attrsOf str;
default = {};
@@ -230,6 +231,7 @@ in
to the id part in ceph i.e. [ "name1" ] would result in mon.name1
'';
};
+ package = mkPackageOptionMD pkgs "ceph" { };
extraConfig = mkOption {
type = with types; attrsOf str;
default = {};
@@ -250,7 +252,7 @@ in
to the id part in ceph i.e. [ "name1" ] would result in osd.name1
'';
};
-
+ package = mkPackageOptionMD pkgs "ceph" { };
extraConfig = mkOption {
type = with types; attrsOf str;
default = {
@@ -278,6 +280,7 @@ in
to the id part in ceph i.e. [ "name1" ] would result in mds.name1
'';
};
+ package = mkPackageOptionMD pkgs "ceph" { };
extraConfig = mkOption {
type = with types; attrsOf str;
default = {};
@@ -289,6 +292,7 @@ in
rgw = {
enable = mkEnableOption (lib.mdDoc "Ceph RadosGW daemon");
+ package = mkPackageOptionMD pkgs "ceph" { };
daemons = mkOption {
type = with types; listOf str;
default = [];