From 33a14d1509295654609cdf8a3c10aab158f4a694 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@oceanbox.io>
Date: Sat, 13 Sep 2025 07:10:25 +0200
Subject: [PATCH] fix: move IB network to 10.1.6.0/24 (get it? :)

---
 rossby/c0/nodes.nix       |  2 +-
 rossby/default.nix        | 10 +++++-----
 rossby/manage/default.nix |  6 +++---
 rossby/mounts.nix         |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rossby/c0/nodes.nix b/rossby/c0/nodes.nix
index cf16679..b22992a 100644
--- a/rossby/c0/nodes.nix
+++ b/rossby/c0/nodes.nix
@@ -6,6 +6,6 @@ map (n: (
     idx = 110 + n;
     name = "c0-${toString n}";
     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";
   })) (filter (x: if x == 1 || x == 7 || x == 12 then false else true) nodes)
diff --git a/rossby/default.nix b/rossby/default.nix
index a444fc1..daa669a 100644
--- a/rossby/default.nix
+++ b/rossby/default.nix
@@ -105,7 +105,7 @@ let
       extraHosts = import ./hosts.nix;
       firewall.extraCommands = ''
         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 = {
       rossby-manage = {
         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;
       };
       rossby-login = {
         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;
       };
       fs-work = {
         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;
       };
@@ -263,7 +263,7 @@ let
                   "${x.name}"
                   "${x.name}.compute.local"
                   "172.16.239.${n}"
-                  "172.16.240.${n}"
+                  "10.1.6.${n}"
               ];
               publicKeyFile = x.pubkey;
           };
diff --git a/rossby/manage/default.nix b/rossby/manage/default.nix
index 181639e..08887a0 100644
--- a/rossby/manage/default.nix
+++ b/rossby/manage/default.nix
@@ -7,21 +7,21 @@ let
            idx = 222;
            name = "rossby";
            address = "172.16.239.${toString idx}";
-           ipoib = "172.16.240.${toString idx}";
+           ipoib = "10.1.6.${toString idx}";
            pubkey = ../login/ssh_host_key.pub;
          }
          rec {
            idx = 210;
            name = "fs-work";
            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;
          }
       ];
   etcdCluster = import ../etcdCluster.nix;
   name = "rossby-manage";
   address = "172.16.239.221";
-  ipoib = "172.16.240.221";
+  ipoib = "10.1.6.221";
 in {
     systemd.targets = {
       sleep.enable = false;
diff --git a/rossby/mounts.nix b/rossby/mounts.nix
index 18520eb..d342a25 100644
--- a/rossby/mounts.nix
+++ b/rossby/mounts.nix
@@ -54,7 +54,7 @@ let
   work =
       if cfg.work then {
         "/work" = {
-          device = "172.16.240.210:/work";
+          device = "10.1.6.210:/work";
           fsType = "nfs4";
           options =  options ++ (if cfg.rdma.enable then [ "rdma" ] else []);
         };