working stokes setup

This commit is contained in:
Jonas Juselius
2022-08-19 14:59:44 +02:00
parent 2dbbaa1ddd
commit 2f1c75a2f0
5 changed files with 53 additions and 58 deletions

View File

@@ -30,7 +30,7 @@ let
boot = {
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
kernelPackages = pkgs.linuxPackages_5_4;
# kernelPackages = pkgs.linuxPackages_5_4;
kernelModules = [ "ib_umad" "ib_ipoib" ];
kernelParams = [
"console=ttyS0,115200"
@@ -38,10 +38,6 @@ let
];
};
services.udev.extraRules = ''
KERNEL=="ibp59s0", SUBSYSTEM=="net", ATTR{create_child}:="0x2222"
'';
console = {
font = "Lat2-Terminus16";
keyMap = "us";
@@ -112,7 +108,7 @@ let
slurm = {
client = true;
mungeKey = ./munge.key;
mungeUid = 996; # hack
mungeUid = 997; # hack
controlMachine = "stokes";
nodeName = [
"c0-[1-8] Sockets=1 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=100000 State=UNKNOWN"
@@ -128,7 +124,7 @@ let
beegfs = {
mds0-0 = {
mgmtdHost = "mds0-0";
connAuthFile = "";
connAuthFile = "/etc/beegfs/connauthfile";
client = {
enable = true;
mountPoint = "/work";
@@ -178,6 +174,19 @@ let
'';
};
fileSystems = {
"/opt" = {
device = "10.1.63.80:/opt";
fsType = "nfs";
options = [ "soft" "rdma" "defaults" "vers=4.2" ];
};
"/data" = {
device = "10.1.63.80:/data";
fsType = "nfs";
options = [ "soft" "rdma" "defaults" "vers=4.2" ];
};
};
environment.variables = {};
systemd.services."serial-getty@ttyS0".enable = true;
@@ -198,17 +207,13 @@ let
};
};
deployment = {
deployment.targetHost = cfg.address;
};
i40efix = {
boot = let kernelExtras = pkgs.callPackage ./kernel.nix {
kernel = pkgs.linuxPackages_5_4.kernel;
}; in {
extraModulePackages = [ kernelExtras.i40e2 ];
kernelModules = [ "ib_umad" "ib_ipoib" "i40e2" ];
};
# boot = let kernelExtras = pkgs.callPackage ./kernel.nix {
# kernel = pkgs.linuxPackages_5_4.kernel;
# }; in {
# extraModulePackages = [ kernelExtras.i40e2 ];
# kernelModules = [ "ib_umad" "ib_ipoib" "i40e2" ];
# };
};
shosts = {
@@ -310,7 +315,7 @@ let
in {
options.node = {
i40efix = mkEnableOption "Apply fix for i40e driver";
# i40efix = mkEnableOption "Apply fix for i40e driver";
myvnc = mkEnableOption "Enable myvnc script";
};
@@ -318,11 +323,11 @@ in {
config = mkMerge [
configuration
deployment
# deployment
shosts
(mkIf config.node.i40efix i40efix)
# (mkIf config.node.i40efix i40efix)
(mkIf config.node.myvnc myvnc)
];