14 files changed, 63 insertions, 24 deletions
diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml
index 9a245a39..40c2864b 100644
--- a/inventory/host_vars/ch-dione.yml
+++ b/inventory/host_vars/ch-dione.yml
@@ -1,12 +1,4 @@
 ---
-preseed_language: de
-preseed_country: AT
-preseed_locales:
-  - de_AT.UTF-8
-  - de_DE.UTF-8
-  - en_US.UTF-8
-  - en_GB.UTF-8
-
 install:
   efi: true
   disks:
@@ -25,5 +17,6 @@ network:
   interfaces:
   - *_network_primary_
 
+
 admin_users_host:
   - equinox
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index e31b8299..50cafbec 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -1,8 +1,18 @@
 ---
-preseed_template_name: "xubuntu-focal-desktop"
+preseed_language: de
+preseed_country: AT
+preseed_locales:
+  - de_AT.UTF-8
+  - de_DE.UTF-8
+  - en_US.UTF-8
+
+preseed_no_splash: no
+preseed_install_tasks:
+  - xubuntu-desktop
+
 
 install:
-  efi: true
+  efi: yes
   disks:
     primary: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0MA04112K
   system_lvm:
diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml
index f7db013e..f35225ac 100644
--- a/inventory/host_vars/ch-helene.yml
+++ b/inventory/host_vars/ch-helene.yml
@@ -17,5 +17,6 @@ network:
   interfaces:
   - *_network_primary_
 
+
 admin_users_host:
   - equinox
diff --git a/inventory/host_vars/ch-telesto.yml b/inventory/host_vars/ch-telesto.yml
index 6dd7c014..6e642dee 100644
--- a/inventory/host_vars/ch-telesto.yml
+++ b/inventory/host_vars/ch-telesto.yml
@@ -5,10 +5,8 @@ preseed_locales:
   - de_AT.UTF-8
   - de_DE.UTF-8
   - en_US.UTF-8
-  - en_GB.UTF-8
 
 preseed_no_splash: no
-
 preseed_install_tasks:
   - xubuntu-desktop
 
@@ -48,6 +46,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
 
 admin_users_host:
diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml
index e0d48b1b..1c82ae9b 100644
--- a/inventory/host_vars/ch-thetys.yml
+++ b/inventory/host_vars/ch-thetys.yml
@@ -16,5 +16,6 @@ network:
   interfaces:
   - *_network_primary_
 
+
 admin_users_host:
   - equinox
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index ab8fca7c..d565c6d8 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -1,12 +1,15 @@
 ---
 install:
+  efi: yes
   disks:
     primary: software-raid
     raid:
       level: 1
       members:
-      - /dev/sda
-      - /dev/sdb
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720805
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720811
+  system_lvm:
+    size: 20G
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml
index 233fc9e8..1152e5cf 100644
--- a/inventory/host_vars/ele-dione.yml
+++ b/inventory/host_vars/ele-dione.yml
@@ -9,7 +9,7 @@ install:
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
-  domain: spreadspace.org
+  domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: eno1
     address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
@@ -17,6 +17,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 base_packages_extra_host:
   - exfat-fuse
   - exfat-utils
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index a28eccf2..a5418e56 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -9,7 +9,7 @@ install:
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
-  domain: spreadspace.org
+  domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: eno1
     address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
@@ -17,6 +17,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 base_packages_extra_host:
   - exfat-fuse
   - exfat-utils
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index 8fe1376d..6e642dee 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -1,17 +1,27 @@
 ---
-base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
+preseed_language: de
+preseed_country: AT
+preseed_locales:
+  - de_AT.UTF-8
+  - de_DE.UTF-8
+  - en_US.UTF-8
+
+preseed_no_splash: no
+preseed_install_tasks:
+  - xubuntu-desktop
 
-preseed_template_name: "xubuntu-focal-desktop"
 
 install:
+  efi: yes
   disks:
     primary: software-raid
     raid:
       level: 1
       members:
-      - /dev/sda
-      - /dev/sdb
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810
   system_lvm:
+    size: 50G
     volumes:
     - name: root
       size: 20G
@@ -36,5 +46,8 @@ network:
   interfaces:
   - *_network_primary_
 
+
+base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
+
 admin_users_host:
   - equinox
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index 69bdec2b..c193de2e 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -16,6 +16,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 admin_users_host:
   - equinox
 
diff --git a/inventory/host_vars/lw-dione.yml b/inventory/host_vars/lw-dione.yml
index 02738ee6..9b05f037 100644
--- a/inventory/host_vars/lw-dione.yml
+++ b/inventory/host_vars/lw-dione.yml
@@ -18,6 +18,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 base_packages_extra_host:
   - exfat-fuse
   - exfat-utils
diff --git a/inventory/host_vars/lw-helene.yml b/inventory/host_vars/lw-helene.yml
index e7919ac7..6b68549b 100644
--- a/inventory/host_vars/lw-helene.yml
+++ b/inventory/host_vars/lw-helene.yml
@@ -18,6 +18,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 base_packages_extra_host:
   - exfat-fuse
   - exfat-utils
diff --git a/inventory/host_vars/lw-telesto.yml b/inventory/host_vars/lw-telesto.yml
index a225d787..ce9847a9 100644
--- a/inventory/host_vars/lw-telesto.yml
+++ b/inventory/host_vars/lw-telesto.yml
@@ -1,17 +1,27 @@
 ---
-base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
+preseed_language: de
+preseed_country: AT
+preseed_locales:
+  - de_AT.UTF-8
+  - de_DE.UTF-8
+  - en_US.UTF-8
+
+preseed_no_splash: no
+preseed_install_tasks:
+  - xubuntu-desktop
 
-preseed_template_name: "xubuntu-focal-desktop"
 
 install:
+  efi: yes
   disks:
     primary: software-raid
     raid:
       level: 1
       members:
-      - /dev/sda
-      - /dev/sdb
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808
+      - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810
   system_lvm:
+    size: 50G
     volumes:
     - name: root
       size: 20G
@@ -37,5 +47,8 @@ network:
   interfaces:
   - *_network_primary_
 
+
+base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
+
 admin_users_host:
   - equinox
diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml
index 77aee114..326c55d7 100644
--- a/inventory/host_vars/lw-thetys.yml
+++ b/inventory/host_vars/lw-thetys.yml
@@ -17,6 +17,7 @@ network:
   interfaces:
   - *_network_primary_
 
+
 admin_users_host:
   - equinox