nixos: Add VM TAP FD, use real WAN (via macvtap) and fix deps
This commit is contained in:
@@ -39,6 +39,40 @@
|
||||
};
|
||||
in
|
||||
{
|
||||
systemd = {
|
||||
network = {
|
||||
links = {
|
||||
"10-wan10g" = {
|
||||
matchConfig.Path = "pci-0000:2d:00.0";
|
||||
linkConfig.Name = "wan10g";
|
||||
};
|
||||
};
|
||||
netdevs = {
|
||||
"25-vm-wan10g" = {
|
||||
netdevConfig = {
|
||||
Name = "vm-wan10g";
|
||||
Kind = "macvtap";
|
||||
};
|
||||
# TODO: Upstream this missing section
|
||||
extraConfig = ''
|
||||
[MACVTAP]
|
||||
Mode=passthru
|
||||
'';
|
||||
};
|
||||
};
|
||||
networks = {
|
||||
"75-wan10g" = {
|
||||
matchConfig.Name = "wan10g";
|
||||
networkConfig.MACVTAP = "vm-wan10g";
|
||||
};
|
||||
"75-vm-wan10g" = {
|
||||
matchConfig.Name = "vm-wan10g";
|
||||
linkConfig.RequiredForOnline = "carrier";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
my = {
|
||||
vms = {
|
||||
instances = {
|
||||
@@ -50,12 +84,21 @@
|
||||
threads = 2;
|
||||
};
|
||||
memory = 3072;
|
||||
networks.base = {
|
||||
waitOnline = "no-carrier";
|
||||
mac = "52:54:00:15:1a:53";
|
||||
networks = {
|
||||
wan = {
|
||||
ifname = "vm-wan10g";
|
||||
bridge = null;
|
||||
tapFD = 100;
|
||||
# Real hardware MAC
|
||||
mac = "00:02:c9:56:24:6e";
|
||||
};
|
||||
base = {
|
||||
waitOnline = "carrier";
|
||||
mac = "52:54:00:15:1a:53";
|
||||
};
|
||||
};
|
||||
drives = [ ] ++ (optionals (!config.my.build.isDevVM) [
|
||||
(vmLVM "estuary" "esp")
|
||||
(mkMerge [ (vmLVM "estuary" "esp") { frontendOpts.bootindex = 0; } ])
|
||||
(vmLVM "estuary" "nix")
|
||||
(vmLVM "estuary" "persist")
|
||||
]);
|
||||
|
Reference in New Issue
Block a user