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

Merge remote-tracking branch 'origin/rossby'

Browse Source
This commit is contained in:
Jonas Juselius
2025-09-12 13:52:20 +02:00
parent 69e47e60d0 f7f6eabb0f
commit c8814ec8d9
7 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ekman/hive.nix
View File

@@ -6,7 +6,7 @@ let
# }) {}; # }) {};
pkgs = import <nixpkgs> {}; pkgs = import <nixpkgs> {};
manage = { ekman-manage = {
deployment = { deployment = {
tags = [ "manage" "ekman" ]; tags = [ "manage" "ekman" ];
allowLocalDeployment = true; allowLocalDeployment = true;
@@ -22,4 +22,4 @@ let
fs-work = import ./fs-work { inherit pkgs; }; fs-work = import ./fs-work { inherit pkgs; };
fs-backup = import ./fs-backup { inherit pkgs; }; fs-backup = import ./fs-backup { inherit pkgs; };
in in
{ inherit manage; } // login // c0 // c0x // c1 // fs-work // fs-backup { inherit ekman-manage; } // login // c0 // c0x // c1 // fs-work // fs-backup

2
rossby/c0/default.nix
View File

@@ -10,7 +10,7 @@ let
nodes = import ./nodes.nix; nodes = import ./nodes.nix;
compute = { compute = {
deployment.tags = [ "compute" "c0" ]; deployment.tags = [ "compute" "c0" "cluster" ];
fileSystems = { fileSystems = {
"/users" = { "/users" = {

18
rossby/default.nix
View File

@@ -99,11 +99,7 @@ let
networking = { networking = {
domain = mkDefault "cluster.local"; domain = mkDefault "cluster.local";
<<<<<<<< HEAD:rossby/default.nix
defaultGateway = mkDefault "172.16.239.1"; defaultGateway = mkDefault "172.16.239.1";
========
defaultGateway = mkDefault "10.255.241.1";
>>>>>>>> ekman:ekman/default.nix
nameservers = mkDefault [ "8.8.8.8" ]; nameservers = mkDefault [ "8.8.8.8" ];
search = mkDefault []; search = mkDefault [];
extraHosts = import ./hosts.nix; extraHosts = import ./hosts.nix;
@@ -152,6 +148,7 @@ let
controlMachine = "rossby-manage"; controlMachine = "rossby-manage";
mailDomain = "oceanbox.io"; mailDomain = "oceanbox.io";
nodeName = [ nodeName = [
<<<<<<< HEAD
"c0-[1-16] Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN" "c0-[1-16] Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
"rossby-login Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN" "rossby-login Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
"rossby-manage Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN" "rossby-manage Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
@@ -164,13 +161,18 @@ let
"ekman Sockets=2 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=256000 TmpDisk=500000 State=UNKNOWN" "ekman Sockets=2 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
"ekman-manage Sockets=2 CoresPerSocket=16 ThreadsPerCore=2 RealMemory=92000 TmpDisk=200000 State=UNKNOWN" "ekman-manage Sockets=2 CoresPerSocket=16 ThreadsPerCore=2 RealMemory=92000 TmpDisk=200000 State=UNKNOWN"
>>>>>>>> ekman:ekman/default.nix >>>>>>>> ekman:ekman/default.nix
=======
"c0-[1-20] Sockets=2 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=350000 TmpDisk=400000 State=UNKNOWN"
"rossby-login Sockets=1 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=60000 TmpDisk=400000 State=UNKNOWN"
"rossby-manage Sockets=1 CoresPerSocket=64 ThreadsPerCore=2 RealMemory=60000 TmpDisk=400000 State=UNKNOWN"
>>>>>>> origin/rossby
]; ];
partitionName = [ partitionName = [
"batch Nodes=c0-[1-16] Default=YES MaxTime=INFINITE State=UP" "batch Nodes=c0-[1-20] Default=YES MaxTime=INFINITE State=UP"
"rossby Nodes=rossby-login MaxTime=1:00:00 State=UP" "rossby Nodes=rossby-login MaxTime=1:00:00 State=UP"
"short Nodes=c0-[1-8] MaxTime=INFINITE State=UP" "short Nodes=c0-[1-10] MaxTime=INFINITE State=UP"
"long Nodes=c0-[3-8] MaxTime=INFINITE State=UP" "long Nodes=c0-[11-12] MaxTime=INFINITE State=UP"
"stats Nodes=c0-[7-8] MaxTime=INFINITE State=UP" "stats Nodes=c0-[19-20] MaxTime=INFINITE State=UP"
]; ];
}; };
}; };

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

@@ -11,7 +11,7 @@ let
address = "10.255.241.90"; address = "10.255.241.90";
in { in {
fs-work = { config, pkgs, ... }: with pkgs; { fs-work = { config, pkgs, ... }: with pkgs; {
deployment.tags = [ "fs" "fs-work" ]; deployment.tags = [ "fs" "fs-work" "cluster" ];
deployment.targetHost = address; deployment.targetHost = address;
system.autoUpgrade.enable = lib.mkForce false; system.autoUpgrade.enable = lib.mkForce false;

6
rossby/hive.nix
View File

@@ -8,15 +8,15 @@ let
rossby-manage = { rossby-manage = {
deployment = { deployment = {
tags = [ "manage" "login" ]; tags = [ "manage" "login" "cluster" ];
allowLocalDeployment = true; allowLocalDeployment = true;
targetHost = null; targetHost = null;
}; };
imports = [ ./manage ]; imports = [ ./manage ];
}; };
rossby-login = import ./login { inherit pkgs; }; login = import ./login { inherit pkgs; };
c0 = import ./c0 { inherit pkgs; }; c0 = import ./c0 { inherit pkgs; };
fs-work = import ./fs-work { inherit pkgs; }; fs-work = import ./fs-work { inherit pkgs; };
in in
{ inherit rossby-manage; } // rossby-login // c0 // fs-work { inherit rossby-manage; } // login // c0 // fs-work

2
rossby/login/default.nix
View File

@@ -6,7 +6,7 @@ let
in in
{ {
rossby-login = { config, pkgs, ... }: with pkgs; { rossby-login = { config, pkgs, ... }: with pkgs; {
deployment.tags = [ "rossby-login" "login" ]; deployment.tags = [ "login" "cluster" ];
deployment.targetHost = address; deployment.targetHost = address;
system.autoUpgrade.enable = lib.mkForce false; system.autoUpgrade.enable = lib.mkForce false;

2
rossby/manage/default.nix
View File

@@ -5,7 +5,7 @@ let
[ [
rec { rec {
idx = 222; idx = 222;
name = "rossby-login"; name = "rossby";
address = "172.16.239.${toString idx}"; address = "172.16.239.${toString idx}";
ipoib = "172.16.240.${toString idx}"; ipoib = "172.16.240.${toString idx}";
pubkey = ../login/ssh_host_key.pub; pubkey = ../login/ssh_host_key.pub;