From 368e060becaafe4e3551b6623560eacbbb8eabb4 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 10 May 2022 18:23:34 +0200
Subject: system_lvm: make default volume sizes overideable

---
 roles/cloud/install/defaults/main.yml                | 6 +++---
 roles/installer/debian/preseed/defaults/main.yml     | 6 +++---
 roles/installer/ubuntu/autoinstall/defaults/main.yml | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'roles')

diff --git a/roles/cloud/install/defaults/main.yml b/roles/cloud/install/defaults/main.yml
index 975400a5..195b6bd0 100644
--- a/roles/cloud/install/defaults/main.yml
+++ b/roles/cloud/install/defaults/main.yml
@@ -4,15 +4,15 @@ hetzner_boot_size: 512M
 hetzner_system_lvm_size_default: all
 hetzner_system_lvm_volumes_default:
   - name: root
-    size: 2560M
+    size: "{{ system_lvm_volume_size_root | default('2560M') }}"
     filesystem: ext4
     mountpoint: /
   - name: var
-    size: 1280M
+    size: "{{ system_lvm_volume_size_var | default('1280M') }}"
     filesystem: ext4
     mountpoint: /var
   - name: var+log
-    size: 768M
+    size: "{{ system_lvm_volume_size_varlog | default('768M') }}"
     filesystem: ext4
     mountpoint: /var/log
     mount_options:
diff --git a/roles/installer/debian/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml
index fd57ef57..7e271783 100644
--- a/roles/installer/debian/preseed/defaults/main.yml
+++ b/roles/installer/debian/preseed/defaults/main.yml
@@ -31,15 +31,15 @@ debian_preseed_system_lvm_reserve_default: 384M
 debian_preseed_system_lvm_size_default: all
 debian_preseed_system_lvm_volumes_default:
   - name: root
-    size: 2560M
+    size: "{{ system_lvm_volume_size_root | default('2560M') }}"
     filesystem: ext4
     mountpoint: /
   - name: var
-    size: 1280M
+    size: "{{ system_lvm_volume_size_var | default('1280M') }}"
     filesystem: ext4
     mountpoint: /var
   - name: var+log
-    size: 768M
+    size: "{{ system_lvm_volume_size_varlog | default('768M') }}"
     filesystem: ext4
     mountpoint: /var/log
     mount_options:
diff --git a/roles/installer/ubuntu/autoinstall/defaults/main.yml b/roles/installer/ubuntu/autoinstall/defaults/main.yml
index 4af5a42d..1115442e 100644
--- a/roles/installer/ubuntu/autoinstall/defaults/main.yml
+++ b/roles/installer/ubuntu/autoinstall/defaults/main.yml
@@ -18,20 +18,20 @@ ubuntu_autoinstall_swraid_boot_size: 256M
 ubuntu_autoinstall_system_lvm_size_default: all
 ubuntu_autoinstall_system_lvm_volumes_default:
   - name: root
-    size: 2.5G
+    size: "{{ system_lvm_volume_size_root | default('2560M') }}"
     filesystem: ext4
     mountpoint: /
   - name: var
-    size: 1280M
+    size: "{{ system_lvm_volume_size_var | default('1280M') }}"
     filesystem: ext4
     mountpoint: /var
   - name: var+log
-    size: 768M
+    size: "{{ system_lvm_volume_size_varlog | default('768M') }}"
     filesystem: ext4
     mountpoint: /var/log
     mount_options:
-    - nodev
     - noatime
+    - nodev
     - noexec
 
 
-- 
cgit v1.2.3