Skip to content

storage-vm: use this for the vms #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brianmcgillion wants to merge 3 commits into
base: main
Choose a base branch
from
Open

storage-vm: use this for the vms #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdaee1a
storage-vm: use this for the vms
brianmcgillion Feb 15, 2026
f531754
msg-vm: remove msg-vm and the associated nats server
brianmcgillion Feb 17, 2026
9876ea9
msg-vm: remove the msg-vm resources
brianmcgillion Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions modules/flake-module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,13 @@
guivm.imports = [ ./microvm/guivm.nix ];
netvm.imports = [ ./microvm/netvm.nix ];
dockervm.imports = [ (import ./microvm/docker/vm.nix { inherit inputs; }) ];
msgvm.imports = [ (import ./microvm/msg/vm.nix { inherit inputs; }) ];

docker-vm-services.imports = [
./fmo/fmo-dci-service
./fmo/fmo-dci-passthrough
./fmo/fmo-onboarding-agent
./fmo/fmo-update-hostname
./fmo/fmo-docker-networking
];
msg-vm-services.imports = [
./fmo/fmo-nats-server
./fmo/fmo-update-hostname
];
netvm-services.imports = [
./fmo/fmo-update-hostname
./fmo/fmo-firewall
Expand Down
1 change: 0 additions & 1 deletion modules/fmo/flake-module.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
./fmo-certs-distribution-host
./fmo-dci-passthrough
./fmo-onboarding-agent
./fmo-nats-server
./fmo-update-hostname
./fmo-docker-networking
];
Expand Down
195 changes: 0 additions & 195 deletions modules/fmo/fmo-nats-server/default.nix
View file
Open in desktop

This file was deleted.

18 changes: 6 additions & 12 deletions modules/hardware/resources/alienware-m18-r2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
# Net VM: 1 vcpu 512 MB
# Audio VM: 1 vcpu 384 MB
# Admin VM: 1 vcpu 512 MB
# Gui VM: 10 vcpu 16384 MB
# Docker VM: 8 vcpu 4096 MB
# Msg VM: 4 vcpu 1024 MB
# Gui VM: 12 vcpu 16896 MB
# Docker VM: 10 vcpu 4608 MB
#
# Memory ballooning is enabled in Ghaf.
#
Expand All @@ -32,20 +31,15 @@ in
config.ghaf.virtualization.vmConfig = {
# Gui VM
guivm = {
mem = mkForce 16384;
vcpu = mkForce 10;
mem = mkForce 16896;
vcpu = mkForce 12;
};

# App VMs
appvms = {
docker = {
mem = mkForce 4096;
vcpu = mkForce 8;
balloonRatio = mkForce 4;
};
msg = {
mem = mkForce 1024;
vcpu = mkForce 4;
mem = mkForce 4608;
vcpu = mkForce 10;
balloonRatio = mkForce 4;
};
};
Expand Down
18 changes: 6 additions & 12 deletions modules/hardware/resources/dell-latitude-7230.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
# Net VM: 1 vcpu 512 MB
# Audio VM: 1 vcpu 384 MB
# Admin VM: 1 vcpu 512 MB
# Gui VM: 2 vcpu 2047 MB
# Docker VM: 4 vcpu 2047 MB
# Msg VM: 2 vcpu 512 MB
# Gui VM: 3 vcpu 2303 MB
# Docker VM: 5 vcpu 2303 MB
#
# Memory ballooning is enabled in Ghaf.
#
Expand All @@ -32,20 +31,15 @@ in
config.ghaf.virtualization.vmConfig = {
# Gui VM
guivm = {
mem = mkForce 2047;
vcpu = mkForce 2;
mem = mkForce 2303;
vcpu = mkForce 3;
};

# App VMs
appvms = {
docker = {
mem = mkForce 2047;
vcpu = mkForce 4;
balloonRatio = mkForce 4;
};
msg = {
mem = mkForce 512;
vcpu = mkForce 2;
mem = mkForce 2303;
vcpu = mkForce 5;
balloonRatio = mkForce 4;
};
};
Expand Down
16 changes: 5 additions & 11 deletions modules/hardware/resources/dell-latitude-7330.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
# Net VM: 1 vcpu 512 MB
# Audio VM: 1 vcpu 384 MB
# Admin VM: 1 vcpu 512 MB
# Gui VM: 2 vcpu 6144 MB
# Docker VM: 2 vcpu 2047 MB
# Msg VM: 1 vcpu 512 MB
# Gui VM: 3 vcpu 6400 MB
# Docker VM: 2 vcpu 2303 MB
#
# Memory ballooning is enabled in Ghaf.
#
Expand All @@ -30,22 +29,17 @@ in
config.ghaf.virtualization.vmConfig = {
# Gui VM
guivm = {
mem = mkForce 6144;
vcpu = mkForce 2;
mem = mkForce 6400;
vcpu = mkForce 3;
};

# App VMs
appvms = {
docker = {
mem = mkForce 2047;
mem = mkForce 2303;
vcpu = mkForce 2;
balloonRatio = mkForce 4;
};
msg = {
mem = mkForce 512;
vcpu = mkForce 1;
balloonRatio = mkForce 4;
};
};
};
}
18 changes: 6 additions & 12 deletions modules/hardware/resources/demo-tower-mk1.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
# Net VM: 1 vcpu 512 MB
# Audio VM: 1 vcpu 384 MB
# Admin VM: 1 vcpu 512 MB
# Gui VM: 14 vcpu 65536 MB
# Docker VM: 8 vcpu 8192 MB
# Msg VM: 4 vcpu 1024 MB
# Gui VM: 16 vcpu 66048 MB
# Docker VM: 10 vcpu 8704 MB
#
# Memory ballooning is enabled in Ghaf.
#
Expand All @@ -30,20 +29,15 @@ in
config.ghaf.virtualization.vmConfig = {
# Gui VM
guivm = {
mem = mkForce 65536;
vcpu = mkForce 14;
mem = mkForce 66048;
vcpu = mkForce 16;
};

# App VMs
appvms = {
docker = {
mem = mkForce 8192;
vcpu = mkForce 8;
balloonRatio = mkForce 4;
};
msg = {
mem = mkForce 1024;
vcpu = mkForce 4;
mem = mkForce 8704;
vcpu = mkForce 10;
balloonRatio = mkForce 4;
};
};
Expand Down
Loading
Loading