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

fix: move IB network to 10.1.6.0/24 (get it? :)

Browse Source
This commit is contained in:
Jonas Juselius
2025-09-13 07:10:25 +02:00
parent 3af5ba3fbd
commit 33a14d1509
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rossby/c0/nodes.nix
View File

@@ -6,6 +6,6 @@ map (n: (
idx = 110 + n; idx = 110 + n;
name = "c0-${toString n}"; name = "c0-${toString n}";
address = "172.16.239.${toString idx}"; address = "172.16.239.${toString idx}";
ipoib = "172.16.240.${toString idx}"; ipoib = "10.1.6.${toString idx}";
pubkey = ./. + "/ssh_host_key.d/c0-${toString n}.pub"; pubkey = ./. + "/ssh_host_key.d/c0-${toString n}.pub";
})) (filter (x: if x == 1 || x == 7 || x == 12 then false else true) nodes) })) (filter (x: if x == 1 || x == 7 || x == 12 then false else true) nodes)

10
rossby/default.nix
View File

@@ -105,7 +105,7 @@ let
extraHosts = import ./hosts.nix; extraHosts = import ./hosts.nix;
firewall.extraCommands = '' firewall.extraCommands = ''
iptables -I INPUT -s 172.16.239.0/24 -j ACCEPT iptables -I INPUT -s 172.16.239.0/24 -j ACCEPT
iptables -I INPUT -s 172.16.240.0/24 -j ACCEPT iptables -I INPUT -s 10.1.6.0/24 -j ACCEPT
''; '';
}; };
@@ -239,19 +239,19 @@ let
programs.ssh.knownHosts = { programs.ssh.knownHosts = {
rossby-manage = { rossby-manage = {
hostNames = [ hostNames = [
"manage" "manage.compute.local" "rossby-manage.oceanbox.io" "172.16.239.221" "172.16.240.221" "manage" "manage.compute.local" "rossby-manage.oceanbox.io" "172.16.239.221" "10.1.6.221"
]; ];
publicKeyFile = ./manage/ssh_host_key.pub; publicKeyFile = ./manage/ssh_host_key.pub;
}; };
rossby-login = { rossby-login = {
hostNames = [ hostNames = [
"rossby" "rossby-login" "rossby-login.compute.local" "rossby.compute.local" "rossby.oceanbox.io" "172.16.239.222" "172.16.240.222" "rossby" "rossby-login" "rossby-login.compute.local" "rossby.compute.local" "rossby.oceanbox.io" "172.16.239.222" "10.1.6.222"
]; ];
publicKeyFile = ./login/ssh_host_key.pub; publicKeyFile = ./login/ssh_host_key.pub;
}; };
fs-work = { fs-work = {
hostNames = [ hostNames = [
"fs-work" "fs-work.compute.local" "172.16.239.201" "172.16.240.210" "fs-work" "fs-work.compute.local" "172.16.239.201" "10.1.6.210"
]; ];
publicKeyFile = ./fs-work/ssh_host_key.pub; publicKeyFile = ./fs-work/ssh_host_key.pub;
}; };
@@ -263,7 +263,7 @@ let
"${x.name}" "${x.name}"
"${x.name}.compute.local" "${x.name}.compute.local"
"172.16.239.${n}" "172.16.239.${n}"
"172.16.240.${n}" "10.1.6.${n}"
]; ];
publicKeyFile = x.pubkey; publicKeyFile = x.pubkey;
}; };

6
rossby/manage/default.nix
View File

@@ -7,21 +7,21 @@ let
idx = 222; idx = 222;
name = "rossby"; name = "rossby";
address = "172.16.239.${toString idx}"; address = "172.16.239.${toString idx}";
ipoib = "172.16.240.${toString idx}"; ipoib = "10.1.6.${toString idx}";
pubkey = ../login/ssh_host_key.pub; pubkey = ../login/ssh_host_key.pub;
} }
rec { rec {
idx = 210; idx = 210;
name = "fs-work"; name = "fs-work";
address = "172.16.239.${toString idx}"; address = "172.16.239.${toString idx}";
ipoib = "172.16.240.${toString idx}"; ipoib = "10.1.6.${toString idx}";
pubkey = ../fs-work/ssh_host_key.pub; pubkey = ../fs-work/ssh_host_key.pub;
} }
]; ];
etcdCluster = import ../etcdCluster.nix; etcdCluster = import ../etcdCluster.nix;
name = "rossby-manage"; name = "rossby-manage";
address = "172.16.239.221"; address = "172.16.239.221";
ipoib = "172.16.240.221"; ipoib = "10.1.6.221";
in { in {
systemd.targets = { systemd.targets = {
sleep.enable = false; sleep.enable = false;

2
rossby/mounts.nix
View File

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