diff --git a/rossby/manage/default.nix b/rossby/manage/default.nix index 157e710..4846ea5 100644 --- a/rossby/manage/default.nix +++ b/rossby/manage/default.nix @@ -122,8 +122,27 @@ in { ]; infiniband-exporter = { enable = true; - nameMap = '' - # 0xe8ebd3030024981e "c0-1" + nameMap = '' # needs fix + 0x1070fd0300abcc72 "c0-1" + 0xb8cef603003440ee "c0-2" + 0x1070fd0300abb6fa "c0-3" + 0x1070fd0300abc642 "c0-4" + 0x043f720300dc7876 "c0-5" + 0x1070fd0300abc636 "c0-6" + 0xb8cef6030063105c "c0-7" + 0xb8cef6030037a476 "c0-8" + 0xb8cef603003443c6 "c0-9" + 0xb8cef6030049bdd6 "c0-10" + 0x043f720300dc7a46 "c0-11" + 0xb8cef6030034410a "c0-12" + 0xb8cef6030049ba72 "c0-13" + 0x1070fd0300abca4a "c0-14" + 0xb8cef60300343056 "c0-15" + 0x1070fd0300abb356 "c0-16" + 0xb8cef60300631770 "c0-17" + 0x1070fd0300abca36 "c0-18" + 0x1070fd0300abcd0a "c0-19" + 0x248a070300c06b90 "switch" ''; }; slurm-exporter = { @@ -159,20 +178,19 @@ in { # iptables -t nat -A POSTROUTING -s 172.16.239.0/24 -j SNAT --to-source 10.255.242.3 ''; }; - }; systemd.network = { networks = { "40-enp65s0np0" = { - matchConfig.Name = "enp65s0np0"; DHCP = "no"; + matchConfig.Name = "enp65s0np0"; address = [ "${address}/24" ]; routes = [ { Gateway = "172.16.239.1"; } ]; }; "45-ibp1s0" = { - matchConfig.Name = "ibp1s0"; DHCP = "no"; + matchConfig.Name = "ibp1s0"; address = [ "${ipoib}/24" ]; }; }; @@ -246,39 +264,40 @@ in { virtualisation.docker.enable = pkgs.lib.mkForce true; - - services.tailscale = { - enable = true; - authKeyFile = "/var/lib/secrets/tailscale.key"; - useRoutingFeatures = "both"; # for exit-node usage - extraUpFlags = [ - "--login-server=https://headscale.svc.oceanbox.io" - "--accept-dns=true" - "--accept-routes=true" - "--advertise-routes=172.16.238.0/24,172.16.239.0/24" - "--snat-subnet-routes=false" - ]; - }; - services.networkd-dispatcher = { - enable = true; - rules = { - "tailscale-router" = { - onState = [ "routable" ]; - script = '' - #!${pkgs.runtimeShell} - ${pkgs.ethtool}/bin/ethtool -K enp65s0np0 rx-udp-gro-forwarding on rx-gro-list off - exit 0 - ''; + services.tailscale = { + enable = true; + authKeyFile = "/var/lib/secrets/tailscale.key"; + useRoutingFeatures = "both"; # for exit-node usage + extraUpFlags = [ + "--login-server=https://headscale.svc.oceanbox.io" + "--accept-dns=true" + "--accept-routes=true" + "--advertise-routes=172.16.238.0/24,172.16.239.0/24" + "--snat-subnet-routes=false" + ]; + }; + services.networkd-dispatcher = { + enable = true; + rules = { + "tailscale-router" = { + onState = [ "routable" ]; + script = '' + #!${pkgs.runtimeShell} + ${pkgs.ethtool}/bin/ethtool -K enp65s0np0 rx-udp-gro-forwarding on + ${pkgs.ethtool}/bin/ethtool -K enp65s0np0 rx-gro-list off + ${pkgs.ethtool}/bin/ethtool -K enp65s0np0 tx-udp-segmentation on + exit 0 + ''; + }; }; }; - }; - imports = [ + imports = [ ./hardware-configuration.nix ../default.nix ../mounts.nix ../myvnc.nix ../../dns.nix - ]; + ]; }