fix: fix ekman part of botched merge
This commit is contained in:
@@ -13,8 +13,8 @@ let
|
||||
deployment.tags = [ "compute" "c0" ];
|
||||
|
||||
fileSystems = {
|
||||
"/users" = {
|
||||
device = "172.16.239.222:/home";
|
||||
"/frontend" = {
|
||||
device = "10.255.241.100:/home";
|
||||
fsType = "nfs4";
|
||||
options = [
|
||||
"soft"
|
||||
@@ -27,7 +27,7 @@ let
|
||||
|
||||
systemd.automounts = [
|
||||
{
|
||||
where = "/users";
|
||||
where = "/frontend";
|
||||
wantedBy = [ "default.target" ];
|
||||
}
|
||||
];
|
||||
@@ -35,23 +35,20 @@ let
|
||||
|
||||
mkCompute = host:
|
||||
let
|
||||
<<<<<<<< HEAD:rossby/c0/default.nix
|
||||
hw = ./hardware-config.d + "/${host.name}.nix";
|
||||
========
|
||||
hw = ./hardware-configuration.d + "/${host.name}.nix";
|
||||
>>>>>>>> ekman:ekman/c0/default.nix
|
||||
in {
|
||||
"${host.name}" = {
|
||||
cluster = {
|
||||
compute = true;
|
||||
k8sNode = true;
|
||||
mounts = {
|
||||
rdma.enable = false;
|
||||
rdma.enable = true;
|
||||
automount.enable = true;
|
||||
users = true;
|
||||
home = false;
|
||||
opt = true;
|
||||
work = false;
|
||||
work = true;
|
||||
data = false;
|
||||
backup = false;
|
||||
ceph = false;
|
||||
};
|
||||
};
|
||||
@@ -61,9 +58,10 @@ let
|
||||
name = host.name;
|
||||
address = host.address;
|
||||
};
|
||||
os.externalInterface = "enp65s0f0";
|
||||
os.externalInterface = "enp33s0f0np0";
|
||||
hpc.compute = true;
|
||||
# hpc.knem = true;
|
||||
hpc.knem = true;
|
||||
# k8s = { inherit etcdCluster; };
|
||||
};
|
||||
|
||||
deployment.targetHost = host.address;
|
||||
@@ -75,31 +73,31 @@ let
|
||||
networking = {
|
||||
hostName = host.name;
|
||||
useDHCP = false;
|
||||
interfaces. enp65s0f0 = {
|
||||
interfaces.enp33s0f0np0 = {
|
||||
useDHCP = false;
|
||||
ipv4.addresses = [ {
|
||||
address = host.address;
|
||||
prefixLength = 24;
|
||||
} ];
|
||||
# ipv4.routes = [ {
|
||||
# address = "10.255.242.0";
|
||||
# prefixLength = 24;
|
||||
# via = "10.255.241.100";
|
||||
# } ];
|
||||
ipv4.routes = [ {
|
||||
address = "10.255.242.0";
|
||||
prefixLength = 24;
|
||||
via = "10.255.241.100";
|
||||
} ];
|
||||
|
||||
};
|
||||
# interfaces."ibp1s0.7666" = {
|
||||
# interfaces."ibp1s0" = {
|
||||
# useDHCP = false;
|
||||
# ipv4.addresses = [ {
|
||||
# address = host.ipoib;
|
||||
# prefixLength = 24;
|
||||
# } ];
|
||||
# };
|
||||
interfaces."ibp1s0" = {
|
||||
useDHCP = false;
|
||||
ipv4.addresses = [ {
|
||||
address = host.ipoib;
|
||||
prefixLength = 24;
|
||||
} ];
|
||||
};
|
||||
};
|
||||
imports = [
|
||||
hw
|
||||
../default.nix
|
||||
../cluster.nix
|
||||
../mounts.nix
|
||||
#./kernel.nix
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user