diff options
| author | Johan Thomsen <jth@dbc.dk> | 2019-06-14 12:46:07 +0200 |
|---|---|---|
| committer | Sarah Brofeldt <sbrofeldt@gmail.com> | 2019-09-04 16:17:18 +0200 |
| commit | fb22d67fa7e4719af2af286f8596108af5e623f7 (patch) | |
| tree | 9d80de12ba7ba2d86ae7c0343a0bba1b14b48e12 /nixos/modules/services/network-filesystems | |
| parent | 85baedaca3c03bb376a9a895fa8421a76f5f3301 (diff) | |
| download | nixlib-fb22d67fa7e4719af2af286f8596108af5e623f7.tar nixlib-fb22d67fa7e4719af2af286f8596108af5e623f7.tar.gz nixlib-fb22d67fa7e4719af2af286f8596108af5e623f7.tar.bz2 nixlib-fb22d67fa7e4719af2af286f8596108af5e623f7.tar.lz nixlib-fb22d67fa7e4719af2af286f8596108af5e623f7.tar.xz nixlib-fb22d67fa7e4719af2af286f8596108af5e623f7.tar.zst nixlib-fb22d67fa7e4719af2af286f8596108af5e623f7.zip | |
ceph: 13.2.4 -> 14.2.1
* remove kinetic * release note * add johanot as maintainer nixos/ceph: create option for mgr_module_path - since the upstream default is no longer correct in v14 * fix module, default location for libexec has changed * ceph: fix test
Diffstat (limited to 'nixos/modules/services/network-filesystems')
| -rw-r--r-- | nixos/modules/services/network-filesystems/ceph.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index 58922897a181..aef284c31a5a 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -38,7 +38,7 @@ let -f --cluster ${clusterName} --id ${daemonId} --setuser ceph \ --setgroup ${if daemonType == "osd" then "disk" else "ceph"}''; } // extraServiceConfig - // optionalAttrs (daemonType == "osd") { ExecStartPre = ''${ceph.out}/libexec/ceph/ceph-osd-prestart.sh \ + // optionalAttrs (daemonType == "osd") { ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh \ --id ${daemonId} --cluster ${clusterName}''; }; } // optionalAttrs (builtins.elem daemonType [ "mds" "mon" "rgw" "mgr" ]) { preStart = '' @@ -88,6 +88,14 @@ in ''; }; + mgrModulePath = mkOption { + type = types.path; + default = "${pkgs.ceph.lib}/lib/ceph/mgr"; + description = '' + Path at which to find ceph-mgr modules. + ''; + }; + monInitialMembers = mkOption { type = with types; nullOr commas; default = null; |