Compare commits
3 Commits
master
...
lake2-ipoi
Author | SHA1 | Date | |
---|---|---|---|
06c75eb3d9 | |||
172a7ffc24 | |||
0744a8a641 |
@ -33,9 +33,10 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
global = {
|
global = {
|
||||||
fsid = "9c8d06e0-485f-4aaf-b16b-06d6daf1232b";
|
fsid = "9c8d06e0-485f-4aaf-b16b-06d6daf1232b";
|
||||||
monHost = "10.0.40.40";
|
monHost = "10.0.42.40";
|
||||||
monInitialMembers = "bay";
|
monInitialMembers = "10.0.42.40";
|
||||||
clusterNetwork = "10.0.40.40/24"; # Use Ethernet only
|
publicNetwork = "10.0.42.40/24";
|
||||||
|
clusterNetwork = "10.0.42.40/24";
|
||||||
};
|
};
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
# Only log to stderr so it appears in the journal
|
# Only log to stderr so it appears in the journal
|
||||||
@ -49,7 +50,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
daemons = [ "mds0" "mds1" ];
|
daemons = [ "mds0" "mds1" ];
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
"host" = "bay";
|
"host" = "10.0.42.40";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
mgr = {
|
mgr = {
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
./slurm.nix
|
./slurm.nix
|
||||||
./ssh.nix
|
./ssh.nix
|
||||||
./users.nix
|
./users.nix
|
||||||
|
./watchdog.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
|
9
m/common/watchdog.nix
Normal file
9
m/common/watchdog.nix
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{ ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
# The boards have a BMC watchdog controlled by IPMI
|
||||||
|
boot.kernelModules = [ "ipmi_watchdog" ];
|
||||||
|
|
||||||
|
# Enable systemd watchdog with 30 s interval
|
||||||
|
systemd.watchdog.runtimeTime = "30s";
|
||||||
|
}
|
@ -17,7 +17,7 @@
|
|||||||
fsType = "ceph";
|
fsType = "ceph";
|
||||||
device = "user@9c8d06e0-485f-4aaf-b16b-06d6daf1232b.cephfs=/";
|
device = "user@9c8d06e0-485f-4aaf-b16b-06d6daf1232b.cephfs=/";
|
||||||
options = [
|
options = [
|
||||||
"mon_addr=10.0.40.40"
|
"mon_addr=10.0.42.40"
|
||||||
"secretfile=${config.age.secrets."secrets/ceph-user".path}"
|
"secretfile=${config.age.secrets."secrets/ceph-user".path}"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -20,9 +20,10 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
global = {
|
global = {
|
||||||
fsid = "9c8d06e0-485f-4aaf-b16b-06d6daf1232b";
|
fsid = "9c8d06e0-485f-4aaf-b16b-06d6daf1232b";
|
||||||
monHost = "10.0.40.40";
|
monHost = "10.0.42.40";
|
||||||
monInitialMembers = "bay";
|
monInitialMembers = "10.0.42.40";
|
||||||
clusterNetwork = "10.0.40.40/24"; # Use Ethernet only
|
publicNetwork = "10.0.42.40/24";
|
||||||
|
clusterNetwork = "10.0.42.40/24";
|
||||||
};
|
};
|
||||||
osd = {
|
osd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -50,4 +51,24 @@
|
|||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
} ];
|
} ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Missing service for volumes, see:
|
||||||
|
# https://www.reddit.com/r/ceph/comments/14otjyo/comment/jrd69vt/
|
||||||
|
systemd.services.ceph-volume = {
|
||||||
|
enable = true;
|
||||||
|
description = "Ceph Volume activation";
|
||||||
|
unitConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
After = "local-fs.target";
|
||||||
|
Wants = "local-fs.target";
|
||||||
|
};
|
||||||
|
path = [ pkgs.ceph pkgs.util-linux pkgs.lvm2 pkgs.cryptsetup ];
|
||||||
|
serviceConfig = {
|
||||||
|
KillMode = "none";
|
||||||
|
Environment = "CEPH_VOLUME_TIMEOUT=10000";
|
||||||
|
ExecStart = "/bin/sh -c 'timeout $CEPH_VOLUME_TIMEOUT ${pkgs.ceph}/bin/ceph-volume lvm activate --all --no-systemd'";
|
||||||
|
TimeoutSec = "0";
|
||||||
|
};
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user