From 65ef8cb1cae766f3445852dca9cd64ae822983d7 Mon Sep 17 00:00:00 2001 From: Sandwich Date: Fri, 2 Jan 2026 16:18:14 +0100 Subject: [PATCH] Enforce 20GiB minimum vm_size --- README.md | 2 +- roles/global_defaults/tasks/main.yml | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 10267e8..52370d4 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ These are prompted by default via `vars_prompt` in `main.yml`, but can be suppli | Variable | Description | Example Value | | ----------- | --------------------------------- | ------------- | | `vm_id` | Unique identifier for the VM. | `101` | -| `vm_size` | Disk size allocated in GB. | `20` | +| `vm_size` | Disk size allocated in GB (min 20). | `20` | | `vm_memory` | Amount of memory in MB. | `2048` | | `vm_cpus` | Number of CPU cores (virtual installs). | `4` | | `vm_ballo` | Ballooning memory size (optional).| `2048` | diff --git a/roles/global_defaults/tasks/main.yml b/roles/global_defaults/tasks/main.yml index 703455b..3bf99a8 100644 --- a/roles/global_defaults/tasks/main.yml +++ b/roles/global_defaults/tasks/main.yml @@ -52,10 +52,7 @@ install_type == "physical" or ( vm_size is defined - and ( - (filesystem == "btrfs" and (vm_size | int) >= 10) - or (filesystem != "btrfs" and (vm_size | int) >= 20) - ) + and (vm_size | int) >= 20 ) ) - >- @@ -64,15 +61,19 @@ or ( vm_size is defined and vm_memory is defined + and filesystem is defined and ( - (vm_size | float) - >= ( - (vm_memory | float / 1024 >= 16.0) - | ternary( - (vm_memory | float / 2048), - [vm_memory | float / 1024, 4.0] | max - ) - + 16 + filesystem != "btrfs" + or ( + (vm_size | float) + >= ( + (vm_memory | float / 1024 >= 16.0) + | ternary( + (vm_memory | float / 2048), + [vm_memory | float / 1024, 4.0] | max + ) + + 5.5 + ) ) ) )