oceanbox/platform
6
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: fix ipoib address range

Browse Source
This commit is contained in:
Jonas Juselius
2025-10-08 20:03:27 +02:00
parent f51f30004e
commit b76f5e309a
5 changed files with 27 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rossby/default.nix
View File

@@ -30,6 +30,15 @@ let
# ];
};
services.resolved = {
enable = true;
dnssec = "false";
fallbackDns = [
"1.1.1.1"
"1.0.0.1"
];
};
console = {
font = "Lat2-Terminus16";
keyMap = "us";
@@ -94,7 +103,7 @@ let
};
cachix.enable = false;
monitoring.nodeExporter.enable = false;
mft.enable = false; # Mellanox MFT
mft.enable = true; # Mellanox MFT
};
networking = {
@@ -106,7 +115,7 @@ let
extraHosts = import ./hosts.nix;
firewall.extraCommands = ''
iptables -I INPUT -s 172.16.239.0/24 -j ACCEPT
iptables -I INPUT -s 10.1.6.0/24 -j ACCEPT
iptables -I INPUT -s 10.16.239.0/24 -j ACCEPT
iptables -I INPUT -s 100.64.0.0/24 -j ACCEPT
'';
};
@@ -244,13 +253,13 @@ let
programs.ssh.knownHosts = {
rossby-manage = {
hostNames = [
"manage" "manage.cluster.local" "rossby-manage.oceanbox.io" "172.16.239.221" "10.1.6.221"
"manage" "manage.cluster.local" "rossby-manage.oceanbox.io" "172.16.239.221" "10.16.239.221"
];
publicKeyFile = ./manage/ssh_host_key.pub;
};
rossby-login = {
hostNames = [
"rossby" "rossby-login" "rossby-login.cluster.local" "rossby.cluster.local" "rossby.oceanbox.io" "172.16.239.222" "10.1.6.222"
"rossby" "rossby-login" "rossby-login.cluster.local" "rossby.cluster.local" "rossby.oceanbox.io" "172.16.239.222" "10.16.239.222"
];
publicKeyFile = ./login/ssh_host_key.pub;
};
@@ -268,7 +277,7 @@ let
"${x.name}"
"${x.name}.cluster.local"
"172.16.239.${n}"
"10.1.6.${n}"
"10.16.239.${n}"
];
publicKeyFile = x.pubkey;
};

18
rossby/fs-work/default.nix
View File

@@ -108,24 +108,6 @@ in {
}
];
};
# interfaces.ibp1s0 = {
# useDHCP = false;
# ipv4.addresses = [
# {
# address = ipoib;
# prefixLength = 24;
# }
# ];
# };
# interfaces.enp129s0f0 = {
# useDHCP = false;
# ipv4.addresses = [
# {
# address = address;
# prefixLength = 24;
# }
# ];
# };
defaultGateway = "172.16.239.1";
firewall = {
allowedTCPPorts = [];

87
rossby/login/default.nix
View File

@@ -113,54 +113,6 @@ in
networking = {
useDHCP = false;
hostName = name;
interfaces.enp65s0np0 = {
useDHCP = false;
ipv4.addresses = [ {
inherit address;
prefixLength = 24;
} ];
# ipv4.routes = [
# {
# address = "10.255.244.0";
# prefixLength = 24;
# via = "10.255.241.99";
# }
# ];
};
# interfaces."ibp65s0f0" = {
# useDHCP = false;
# ipv4.addresses = [ {
# address = "10.255.243.100";
# prefixLength = 24;
# } ];
# };
# interfaces."enp65s0f1np1" = {
# useDHCP = false;
# ipv4.addresses = [ {
# address = "10.255.244.100";
# prefixLength = 24;
# } ];
# };
# interfaces.enp33s0f0np0 = {
# useDHCP = false;
# ipv4.addresses = [ {
# address = "10.255.242.2";
# prefixLength = 24;
# } ];
# ipv4.routes = [
# {
# address = "10.1.8.0";
# prefixLength = 24;
# via = "10.255.242.1";
# }
# {
# address = "10.1.30.0";
# prefixLength = 24;
# via = "10.255.242.1";
# }
# ];
# };
defaultGateway = "172.16.239.1";
firewall = {
allowedTCPPorts = [ 6443 ];
extraCommands = ''
@@ -169,6 +121,16 @@ in
};
};
systemd.network = {
wait-online.enable = false;
networks.wired = {
matchConfig.Name = "enp65s0np0";
DHCP = "no";
address = [ "${address}/24" ];
routes = [ { Gateway = "172.16.239.1"; } ];
};
};
fileSystems = {
"/home" = {
device = "/ceph/volumes/nfs/home";
@@ -182,30 +144,6 @@ in
device = "/vol/vol2";
options = [ "bind" ];
};
# "/exports/home" = {
# device = "/home";
# options = [ "bind" ];
# };
# "/exports/opt/bin" = {
# device = "/opt/bin";
# options = [ "bind" ];
# };
# "/exports/opt/sif" = {
# device = "/opt/sif";
# options = [ "bind" ];
# };
# "/exports/opt/singularity" = {
# device = "/opt/singularity";
# options = [ "bind" ];
# };
# "/exports/nfs-provisioner" = {
# device = "/vol/nfs-provisioner";
# options = [ "bind" ];
# };
# "/users" = {
# device = "/home";
# options = [ "bind" ];
# };
};
systemd.automounts = [
@@ -333,9 +271,8 @@ in
useRoutingFeatures = "server"; # for exit-node usage
extraUpFlags = [
"--login-server=https://headscale.svc.oceanbox.io"
"--accept-dns=false"
"--advertise-exit-node"
"--advertise-tags=tag:rossby"
"--accept-dns=true"
# "--advertise-tags=tag:rossby"
];
};

6
rossby/manage/default.nix
View File

@@ -183,15 +183,9 @@ in {
};
services.resolved = {
enable = true;
dnssec = "false";
extraConfig = ''
DNSStubListener=no
'';
fallbackDns = [
"1.1.1.1"
"1.0.0.1"
];
};
fileSystems = {

2
rossby/mounts.nix
View File

@@ -38,7 +38,7 @@ let
work =
if cfg.work then {
"/work" = {
device = if cfg.rdma.enable then "10.1.6.210:/work" else "172.16.239.210:/work";
device = if cfg.rdma.enable then "10.16.239.210:/work" else "172.16.239.210:/work";
fsType = "nfs4";
options = options ++ (if cfg.rdma.enable then [ "rdma" ] else []);
};