c3d2/nix-config
c3d2
/
nix-config
23
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

modules/cluster: prepare for leon

This commit is contained in:
Astro 2022-11-21 04:00:54 +01:00
parent ecbb8818bb
commit 4b6fce111a
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/cluster/default.nix
View File

@ -49,6 +49,12 @@ in {
uid = 1001; uid = 1001;
sshKeys = config.users.users.root.openssh.authorizedKeys.keys; sshKeys = config.users.users.root.openssh.authorizedKeys.keys;
}; };
users.leon = {
uid = 1002;
sshKeys = with import ../../users.nix;
leon.sshKeys ++
astro.sshKeys;
};
deploy.customizationModule = ./deployment.nix; deploy.customizationModule = ./deployment.nix;
storage.glusterfs = { storage.glusterfs = {

19
modules/cluster/deployment.nix
View File

@ -33,6 +33,8 @@ let
then s then s
else withoutLeadingSlash s'; else withoutLeadingSlash s';
writableStoreOverlayImage = "/var/tmp/${user}-${repo}-${vmName}-overlay.img";
in in
{ {
deployment.networks = nets; deployment.networks = nets;
@ -42,6 +44,11 @@ in
vcpu = config.deployment.vcpu; vcpu = config.deployment.vcpu;
mem = config.deployment.mem; mem = config.deployment.mem;
preStart = ''
# Discard old writable store overlay
rm -f "${writableStoreOverlayImage}"
'';
shares = [ { shares = [ {
proto = "virtiofs"; proto = "virtiofs";
tag = "ro-store"; tag = "ro-store";
@ -55,12 +62,12 @@ in
source = "/glusterfs/fast/microvms/${user}/${repo}/${vmName}/${withoutLeadingSlash mountPoint}"; source = "/glusterfs/fast/microvms/${user}/${repo}/${vmName}/${withoutLeadingSlash mountPoint}";
inherit mountPoint; inherit mountPoint;
}) config.deployment.persistedShares; }) config.deployment.persistedShares;
# volumes = [ { volumes = [ {
# image = "/glusterfs/fast/microvms/${user}/${repo}/${vmName}/overlay.img"; image = writableStoreOverlayImage;
# mountPoint = "/"; mountPoint = config.microvm.writableStoreOverlay;
# size = 8 * 1024; size = 8 * 1024;
# } ]; } ];
# writableStoreOverlay = "/nix/.rw-store"; writableStoreOverlay = "/nix/.rw-store";
interfaces = map (net: { interfaces = map (net: {
type = "tap"; type = "tap";