Merge branch 'topic/preseed-configurable-disk-layout-contd'

18 files changed, 74 insertions, 355 deletions

diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index d71f38d8..84ca3962 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -5,6 +5,24 @@ install:
   efi: true
   disks:
     primary: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0MA04112K
+  system_lvm:
+    volumes:
+    - name: root
+      size: 30G
+      filesystem: ext4
+      mountpoint: /
+    - name: var+log
+      size: 768M
+      filesystem: ext4
+      mountpoint: /var/log
+      mount_options:
+      - noatime
+      - nodev
+      - noexec
+    - name: home
+      size: 200G
+      filesystem: ext4
+      mountpoint: /home
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
diff --git a/inventory/host_vars/ch-hroottest-obsd.yml b/inventory/host_vars/ch-hroottest-obsd.yml
deleted file mode 100644
index 96ec2fe2..00000000
--- a/inventory/host_vars/ch-hroottest-obsd.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-install:
-  vm:
-    memory: 1G
-    numcpus: 1
-    autostart: True
-  disks:
-    primary: /dev/vda
-    virtio:
-      vda:
-        type: zfs
-        name: root
-        size: 10g
-  interfaces:
-  - bridge: br-public
-    name: vio0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  primary: &_network_primary_
-    name: vio0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-  interfaces:
-  - *_network_primary_
diff --git a/inventory/host_vars/ch-hroottest-vm1.yml b/inventory/host_vars/ch-hroottest-vm1.yml
deleted file mode 100644
index a7f45252..00000000
--- a/inventory/host_vars/ch-hroottest-vm1.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 4
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 20g
-        properties:
-          refreservation: none
-      sdb:
-        type: zfs
-        name: data
-        size: 100g
-        properties:
-          refreservation: none
-          compression: off
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-  interfaces:
-  - *_network_primary_
diff --git a/inventory/host_vars/ch-hroottest.yml b/inventory/host_vars/ch-hroottest.yml
deleted file mode 100644
index 4ed4449f..00000000
--- a/inventory/host_vars/ch-hroottest.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-install:
-  cloud:
-    credentials: "{{ vault_hroot_robot_account }}"
-    server_name: "{{ host_name }}"
-  disks:
-    primary: software-raid
-    raid:
-      level: 1
-      members:
-      - /dev/sda
-      - /dev/sdb
-    root_lvm_size: 10G
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  interfaces:
-  - name: br-public
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-
-
-apt_repo_components:
-  - main
-  - contrib  ## for zfs
-  - non-free ## for microcode updates
-
-
-zfs_arc_size:
-  min: "{{ 1 * 1024 * 1024 * 1024 }}"
-  max: "{{ 4 * 1024 * 1024 * 1024 }}"
-
-zfs_zpools:
-  storage:
-    mountpoint: /srv/storage
-    create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD753LJ_S13UJ1LS801071-part3 /dev/disk/by-id/ata-SAMSUNG_HD753LJ_S13UJ1BQ802393-part3
-
-# zfs_sanoid_modules:
-#   storage/vm:
-#     use_template: production
-#     recursive: yes
-#     process_children_only: yes
-
-docker_zfs:
-  pool: storage
-  name: docker
-  properties:
-    quota: 15G
-
-kubelet_zfs:
-  pool: storage
-  name: kubelet
-  properties:
-    quota: 15G
-
-kubernetes_version: 1.18.5
-kubernetes_container_runtime: docker
-kubernetes_standalone_max_pods: 15
-kubernetes_standalone_pod_cidr: 192.168.255.0/24
-kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ch-k8s-m0.yml b/inventory/host_vars/ch-k8s-m0.yml
deleted file mode 100644
index 7d81b792..00000000
--- a/inventory/host_vars/ch-k8s-m0.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 2
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 20g
-        properties:
-          refreservation: none
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-    overlay: "{{ (vm_host.network.bridges.public.overlay.prefix | ipaddr(vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
-  interfaces:
-  - *_network_primary_
-
-external_ip: "{{ network.primary.overlay }}"
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 7G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 5G
-  fs: ext4
diff --git a/inventory/host_vars/ch-k8s-m1.yml b/inventory/host_vars/ch-k8s-m1.yml
deleted file mode 100644
index 7d81b792..00000000
--- a/inventory/host_vars/ch-k8s-m1.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 2
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 20g
-        properties:
-          refreservation: none
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-    overlay: "{{ (vm_host.network.bridges.public.overlay.prefix | ipaddr(vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
-  interfaces:
-  - *_network_primary_
-
-external_ip: "{{ network.primary.overlay }}"
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 7G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 5G
-  fs: ext4
diff --git a/inventory/host_vars/ch-k8s-m2.yml b/inventory/host_vars/ch-k8s-m2.yml
deleted file mode 100644
index 6de6fbfb..00000000
--- a/inventory/host_vars/ch-k8s-m2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 2
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 20g
-        properties:
-          refreservation: none
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-  interfaces:
-  - *_network_primary_
-
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 7G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 5G
-  fs: ext4
diff --git a/inventory/host_vars/ch-k8s-w0.yml b/inventory/host_vars/ch-k8s-w0.yml
deleted file mode 100644
index 51095a86..00000000
--- a/inventory/host_vars/ch-k8s-w0.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 4
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 100g
-        properties:
-          refreservation: none
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-  interfaces:
-  - *_network_primary_
-
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 15G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 15G
-  fs: ext4
diff --git a/inventory/host_vars/ch-k8s-w1.yml b/inventory/host_vars/ch-k8s-w1.yml
deleted file mode 100644
index 51095a86..00000000
--- a/inventory/host_vars/ch-k8s-w1.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 4
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 100g
-        properties:
-          refreservation: none
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-  interfaces:
-  - *_network_primary_
-
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 15G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 15G
-  fs: ext4
diff --git a/inventory/host_vars/ch-mimas2.yml b/inventory/host_vars/ch-mimas2.yml
index 46fc78d2..49973cd1 100644
--- a/inventory/host_vars/ch-mimas2.yml
+++ b/inventory/host_vars/ch-mimas2.yml
@@ -4,8 +4,6 @@ install:
     credentials:
       token: "{{ vault_hcloud_api_token }}"
     server_name: "{{ host_name }}"
-  disks:
-    root_lvm_size: all
 
 network: {}
 
diff --git a/inventory/host_vars/ch-oulu.yml b/inventory/host_vars/ch-oulu.yml
index d0d035d2..e63e6f2d 100644
--- a/inventory/host_vars/ch-oulu.yml
+++ b/inventory/host_vars/ch-oulu.yml
@@ -2,13 +2,14 @@
 install:
   efi: true
   disks:
-    root_lvm_size: 15G
     primary: software-raid
     raid:
       level: 1
       members:
       - /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0M800161Z
       - /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0M800191M
+  system_lvm:
+    size: 15G
 
 network:
   nameservers:
diff --git a/inventory/host_vars/ele-lt.yml b/inventory/host_vars/ele-lt.yml
index 5ef66f54..1bfcf901 100644
--- a/inventory/host_vars/ele-lt.yml
+++ b/inventory/host_vars/ele-lt.yml
@@ -3,8 +3,6 @@ install:
   cloud:
     credentials:
       token: "{{ vault_hcloud_api_token }}"
-  disks:
-    root_lvm_size: all
 
 network: {}
 
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index a8b2b162..8fe1376d 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -1,9 +1,30 @@
 ---
 base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
 
-preseed_template_name: "xubuntu-eoan-desktop-with-raid"
+preseed_template_name: "xubuntu-focal-desktop"
 
-install: {}
+install:
+  disks:
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/sda
+      - /dev/sdb
+  system_lvm:
+    volumes:
+    - name: root
+      size: 20G
+      filesystem: ext4
+      mountpoint: /
+    - name: var+log
+      size: 768M
+      filesystem: ext4
+      mountpoint: /var/log
+      mount_options:
+      - noatime
+      - nodev
+      - noexec
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
diff --git a/inventory/host_vars/lw-telesto.yml b/inventory/host_vars/lw-telesto.yml
index 4a10338e..a225d787 100644
--- a/inventory/host_vars/lw-telesto.yml
+++ b/inventory/host_vars/lw-telesto.yml
@@ -1,9 +1,30 @@
 ---
 base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
 
-preseed_template_name: "xubuntu-eoan-desktop-with-raid"
+preseed_template_name: "xubuntu-focal-desktop"
 
-install: {}
+install:
+  disks:
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/sda
+      - /dev/sdb
+  system_lvm:
+    volumes:
+    - name: root
+      size: 20G
+      filesystem: ext4
+      mountpoint: /
+    - name: var+log
+      size: 768M
+      filesystem: ext4
+      mountpoint: /var/log
+      mount_options:
+      - noatime
+      - nodev
+      - noexec
 
 network:
   nameservers:
diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml
index 353fe8c1..23dbbc15 100644
--- a/inventory/host_vars/sk-2019.yml
+++ b/inventory/host_vars/sk-2019.yml
@@ -10,7 +10,8 @@ install:
       members:
       - /dev/nvme0n1
       - /dev/nvme1n1
-    root_lvm_size: 20G
+  system_lvm:
+    size: 20G
 
 network: {}
 
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index e989d37e..a131189c 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -10,7 +10,8 @@ install:
       members:
       - /dev/nvme0n1
       - /dev/nvme1n1
-    root_lvm_size: 10G
+  system_lvm:
+    size: 10G
 
 network:
   nameservers: "{{ vm_host.network.dns }}"
diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml
index f8167017..0e4e1340 100644
--- a/inventory/host_vars/sk-cloudia/vars.yml
+++ b/inventory/host_vars/sk-cloudia/vars.yml
@@ -10,7 +10,8 @@ install:
       members:
       - /dev/nvme0n1
       - /dev/nvme1n1
-    root_lvm_size: 15G
+  system_lvm:
+    size: 15G
 
 network: {}
 
diff --git a/inventory/host_vars/sk-tomnext.yml b/inventory/host_vars/sk-tomnext.yml
index 3702bd54..410a1d29 100644
--- a/inventory/host_vars/sk-tomnext.yml
+++ b/inventory/host_vars/sk-tomnext.yml
@@ -10,7 +10,8 @@ install:
       members:
       - /dev/nvme0n1
       - /dev/nvme1n1
-    root_lvm_size: 10G
+  system_lvm:
+    size: 10G
 
 network:
   nameservers: "{{ vm_host.network.dns }}"