fix: misc fixes and tweaks
This commit is contained in:
@@ -10,7 +10,7 @@ let
|
||||
nodes = import ./nodes.nix;
|
||||
|
||||
compute = {
|
||||
deployment.tags = [ "compute" "c0" ];
|
||||
deployment.tags = [ "compute" "c0" "cluster" ];
|
||||
|
||||
fileSystems = {
|
||||
"/users" = {
|
||||
|
||||
@@ -147,16 +147,16 @@ let
|
||||
controlMachine = "rossby-manage";
|
||||
mailDomain = "oceanbox.io";
|
||||
nodeName = [
|
||||
"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-manage Sockets=2 CoresPerSocket=64 ThreadsPerCore=1 RealMemory=256000 TmpDisk=500000 State=UNKNOWN"
|
||||
"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"
|
||||
];
|
||||
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"
|
||||
"short Nodes=c0-[1-8] MaxTime=INFINITE State=UP"
|
||||
"long Nodes=c0-[3-8] MaxTime=INFINITE State=UP"
|
||||
"stats Nodes=c0-[7-8] MaxTime=INFINITE State=UP"
|
||||
"short Nodes=c0-[1-10] MaxTime=INFINITE State=UP"
|
||||
"long Nodes=c0-[11-12] MaxTime=INFINITE State=UP"
|
||||
"stats Nodes=c0-[19-20] MaxTime=INFINITE State=UP"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ let
|
||||
address = "10.255.241.90";
|
||||
in {
|
||||
fs-work = { config, pkgs, ... }: with pkgs; {
|
||||
deployment.tags = [ "fs" "fs-work" ];
|
||||
deployment.tags = [ "fs" "fs-work" "cluster" ];
|
||||
deployment.targetHost = address;
|
||||
system.autoUpgrade.enable = lib.mkForce false;
|
||||
|
||||
|
||||
@@ -8,15 +8,15 @@ let
|
||||
|
||||
rossby-manage = {
|
||||
deployment = {
|
||||
tags = [ "manage" "login" ];
|
||||
tags = [ "manage" "login" "cluster" ];
|
||||
allowLocalDeployment = true;
|
||||
targetHost = null;
|
||||
};
|
||||
imports = [ ./rossby/manage ];
|
||||
imports = [ ./manage ];
|
||||
};
|
||||
|
||||
rossby-login = import ./rossby/login { inherit pkgs; };
|
||||
c0 = import ./rossby/c0 { inherit pkgs; };
|
||||
fs-work = import ./rossby/fs-work { inherit pkgs; };
|
||||
login = import ./login { inherit pkgs; };
|
||||
c0 = import ./c0 { inherit pkgs; };
|
||||
fs-work = import ./fs-work { inherit pkgs; };
|
||||
in
|
||||
{ inherit rossby-manage; } // rossby-login // c0 // fs-work
|
||||
{ inherit rossby-manage; } // login // c0 // fs-work
|
||||
@@ -6,7 +6,7 @@ let
|
||||
in
|
||||
{
|
||||
rossby-login = { config, pkgs, ... }: with pkgs; {
|
||||
deployment.tags = [ "rossby-login" "login" ];
|
||||
deployment.tags = [ "login" "cluster" ];
|
||||
deployment.targetHost = address;
|
||||
system.autoUpgrade.enable = lib.mkForce false;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ let
|
||||
[
|
||||
rec {
|
||||
idx = 222;
|
||||
name = "rossby-login";
|
||||
name = "rossby";
|
||||
address = "172.16.239.${toString idx}";
|
||||
ipoib = "172.16.240.${toString idx}";
|
||||
pubkey = ../login/ssh_host_key.pub;
|
||||
|
||||
Reference in New Issue
Block a user