sokai/mynixos-config
1
1
Fork 0
forked from mirrors_public/oddlama_nix-config
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(microvm): remove VM ids in favor of automatically assigned MACs

Browse source
This commit is contained in:
oddlama 2023-06-03 14:47:59 +02:00
parent 135528e082
commit bd803c5976
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
2 changed files with 74 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/microvms.nix
View file

@ -91,7 +91,7 @@
node = import ../nix/generate-node.nix inputs vmCfg.nodeName {
inherit (vmCfg) system configPath;
};
mac = net.mac.addPrivate vmCfg.id cfg.networking.baseMac;
mac = (net.mac.assignMacs "02:01:27:00:00:00" 24 [] (attrNames vms)).${vmName};
in {
# Allow children microvms to know which node is their parent
specialArgs =
@ -295,20 +295,6 @@ in {
'';
};
id = mkOption {
type =
types.addCheck types.int (x: x > 1)
// {
name = "positiveInt1";
description = "positive integer greater than 1";
};
description = mdDoc ''
A unique id for this VM. It will be used to derive a MAC address from the host's
base MAC, and may be used as a stable id by your MicroVM config if necessary.
Ids don't need to be contiguous.
'';
};
networking = {
mainLinkName = mkOption {
type = types.str;
@ -355,15 +341,6 @@ in {
config = mkIf (vms != {}) (
{
assertions = let
duplicateIds = extraLib.duplicates (mapAttrsToList (_: vmCfg: toString vmCfg.id) vms);
in [
{
assertion = duplicateIds == [];
message = "Duplicate MicroVM ids: ${concatStringsSep ", " duplicateIds}";
}
];
# Define a local wireguard server to communicate with vms securely
extra.wireguard."${nodeName}-local-vms" = {
server = {