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

32 files changed, 108 insertions, 54 deletions

diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index f33235d1..5b078528 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -12,6 +12,7 @@ network_zones:
       limit: 199
     offsets:
       ch-equinox-ws: 1
+      ch-oulu: 2
       ch-auth: 88
       ch-prometheus: 99
       ch-prometheus-old: 250
diff --git a/inventory/host_vars/ch-gw-lan.yml b/inventory/host_vars/ch-gw-lan.yml
index 35f98291..be092c15 100644
--- a/inventory/host_vars/ch-gw-lan.yml
+++ b/inventory/host_vars/ch-gw-lan.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 512
-    numcpu: 2
+    memory: 512M
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-hroottest-obsd.yml b/inventory/host_vars/ch-hroottest-obsd.yml
index f7d5cba7..96ec2fe2 100644
--- a/inventory/host_vars/ch-hroottest-obsd.yml
+++ b/inventory/host_vars/ch-hroottest-obsd.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 1024
-    numcpu: 1
+    memory: 1G
+    numcpus: 1
     autostart: True
   disks:
     primary: /dev/vda
diff --git a/inventory/host_vars/ch-hroottest-vm1.yml b/inventory/host_vars/ch-hroottest-vm1.yml
index 4f9e7e82..a7f45252 100644
--- a/inventory/host_vars/ch-hroottest-vm1.yml
+++ b/inventory/host_vars/ch-hroottest-vm1.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 4
+    memory: 4G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-hroottest.yml b/inventory/host_vars/ch-hroottest.yml
index 7c08fe04..4ed4449f 100644
--- a/inventory/host_vars/ch-hroottest.yml
+++ b/inventory/host_vars/ch-hroottest.yml
@@ -4,7 +4,12 @@ install:
     credentials: "{{ vault_hroot_robot_account }}"
     server_name: "{{ host_name }}"
   disks:
-    layout: sata_raid
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/sda
+      - /dev/sdb
     root_lvm_size: 10G
 
 network:
diff --git a/inventory/host_vars/ch-jump.yml b/inventory/host_vars/ch-jump.yml
index 954819ba..e61cad17 100644
--- a/inventory/host_vars/ch-jump.yml
+++ b/inventory/host_vars/ch-jump.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 768
-    numcpu: 2
+    memory: 768M
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-k8s-m0.yml b/inventory/host_vars/ch-k8s-m0.yml
index dc42824f..7d81b792 100644
--- a/inventory/host_vars/ch-k8s-m0.yml
+++ b/inventory/host_vars/ch-k8s-m0.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 2
+    memory: 4G
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-k8s-m1.yml b/inventory/host_vars/ch-k8s-m1.yml
index dc42824f..7d81b792 100644
--- a/inventory/host_vars/ch-k8s-m1.yml
+++ b/inventory/host_vars/ch-k8s-m1.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 2
+    memory: 4G
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-k8s-m2.yml b/inventory/host_vars/ch-k8s-m2.yml
index da9fbe18..6de6fbfb 100644
--- a/inventory/host_vars/ch-k8s-m2.yml
+++ b/inventory/host_vars/ch-k8s-m2.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 2
+    memory: 4G
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-k8s-w0.yml b/inventory/host_vars/ch-k8s-w0.yml
index 979efc24..51095a86 100644
--- a/inventory/host_vars/ch-k8s-w0.yml
+++ b/inventory/host_vars/ch-k8s-w0.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 4
+    memory: 4G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-k8s-w1.yml b/inventory/host_vars/ch-k8s-w1.yml
index 979efc24..51095a86 100644
--- a/inventory/host_vars/ch-k8s-w1.yml
+++ b/inventory/host_vars/ch-k8s-w1.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 4
+    memory: 4G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-keyserver.yml b/inventory/host_vars/ch-keyserver.yml
index 60ab034b..131da209 100644
--- a/inventory/host_vars/ch-keyserver.yml
+++ b/inventory/host_vars/ch-keyserver.yml
@@ -3,8 +3,8 @@ apt_repo_provider: ffgraz
 
 install:
   vm:
-    mem: 2048
-    numcpu: 2
+    memory: 2G
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-mimas.yml b/inventory/host_vars/ch-mimas.yml
index dfec3866..38422a30 100644
--- a/inventory/host_vars/ch-mimas.yml
+++ b/inventory/host_vars/ch-mimas.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 2048
-    numcpu: 4
+    memory: 2G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/vda
diff --git a/inventory/host_vars/ch-nic.yml b/inventory/host_vars/ch-nic.yml
index d26b1c40..60c68f57 100644
--- a/inventory/host_vars/ch-nic.yml
+++ b/inventory/host_vars/ch-nic.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 768
-    numcpu: 2
+    memory: 768M
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-oulu.yml b/inventory/host_vars/ch-oulu.yml
new file mode 100644
index 00000000..d0d035d2
--- /dev/null
+++ b/inventory/host_vars/ch-oulu.yml
@@ -0,0 +1,22 @@
+---
+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
+
+network:
+  nameservers:
+    - 9.9.9.9
+  domain: "{{ host_domain }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
diff --git a/inventory/host_vars/ch-router-obsd.yml b/inventory/host_vars/ch-router-obsd.yml
index 71137da1..74ecb75b 100644
--- a/inventory/host_vars/ch-router-obsd.yml
+++ b/inventory/host_vars/ch-router-obsd.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 512
-    numcpu: 1
+    memory: 512M
+    numcpus: 1
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ch-testvm.yml b/inventory/host_vars/ch-testvm.yml
index 5b5e465e..7f74a891 100644
--- a/inventory/host_vars/ch-testvm.yml
+++ b/inventory/host_vars/ch-testvm.yml
@@ -3,8 +3,8 @@ apt_repo_provider: ffgraz
 
 install:
   vm:
-    mem: 1024
-    numcpu: 1
+    memory: 1G
+    numcpus: 1
     autostart: False
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index 865bcebb..ab8fca7c 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -1,7 +1,12 @@
 ---
-preseed_template_name: "debian-buster-with-raid"
-
-install: {}
+install:
+  disks:
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/sda
+      - /dev/sdb
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
diff --git a/inventory/host_vars/ele-gwhetzner.yml b/inventory/host_vars/ele-gwhetzner.yml
index d349ddcc..3be84fd7 100644
--- a/inventory/host_vars/ele-gwhetzner.yml
+++ b/inventory/host_vars/ele-gwhetzner.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 1024
-    numcpu: 1
+    memory: 1G
+    numcpus: 1
     autostart: False
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/ele-mur.yml b/inventory/host_vars/ele-mur.yml
index b7d4d38e..3ee20fa4 100644
--- a/inventory/host_vars/ele-mur.yml
+++ b/inventory/host_vars/ele-mur.yml
@@ -7,8 +7,8 @@ apt_repo_provider: ffgraz
 
 install:
   vm:
-    mem: 1024
-    numcpu: 1
+    memory: 1G
+    numcpus: 1
     autostart: False
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml
index 8005b9d9..dcf51a45 100644
--- a/inventory/host_vars/emc-master.yml
+++ b/inventory/host_vars/emc-master.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 10240
-    numcpu: 6
+    memory: 10G
+    numcpus: 6
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/lw-master.yml b/inventory/host_vars/lw-master.yml
index 8005b9d9..dcf51a45 100644
--- a/inventory/host_vars/lw-master.yml
+++ b/inventory/host_vars/lw-master.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 10240
-    numcpu: 6
+    memory: 10G
+    numcpus: 6
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/r3-vex2.yml b/inventory/host_vars/r3-vex2.yml
index d5471743..bf602568 100644
--- a/inventory/host_vars/r3-vex2.yml
+++ b/inventory/host_vars/r3-vex2.yml
@@ -3,8 +3,8 @@ apt_repo_provider: ffgraz
 
 install:
   vm:
-    mem: 2048
-    numcpu: 2
+    memory: 2G
+    numcpus: 2
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml
index 5bba107a..353fe8c1 100644
--- a/inventory/host_vars/sk-2019.yml
+++ b/inventory/host_vars/sk-2019.yml
@@ -4,7 +4,12 @@ install:
     credentials: "{{ vault_hroot_robot_account }}"
     server_name: 2019skillz
   disks:
-    layout: nvme_raid
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/nvme0n1
+      - /dev/nvme1n1
     root_lvm_size: 20G
 
 network: {}
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index 0c990b74..e989d37e 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -4,7 +4,12 @@ install:
     credentials: "{{ vault_hroot_robot_account }}"
     server_name: "{{ host_name }}"
   disks:
-    layout: nvme_raid
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/nvme0n1
+      - /dev/nvme1n1
     root_lvm_size: 10G
 
 network:
diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml
index d7a2474e..f8167017 100644
--- a/inventory/host_vars/sk-cloudia/vars.yml
+++ b/inventory/host_vars/sk-cloudia/vars.yml
@@ -4,7 +4,12 @@ install:
     credentials: "{{ vault_hroot_robot_account }}"
     server_name: "{{ host_name }}"
   disks:
-    layout: nvme_raid
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/nvme0n1
+      - /dev/nvme1n1
     root_lvm_size: 15G
 
 network: {}
diff --git a/inventory/host_vars/sk-testvm.yml b/inventory/host_vars/sk-testvm.yml
index 8e285363..86c00c1f 100644
--- a/inventory/host_vars/sk-testvm.yml
+++ b/inventory/host_vars/sk-testvm.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 1024
-    numcpu: 1
+    memory: 1G
+    numcpus: 1
     autostart: False
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/sk-tomnext-hp.yml b/inventory/host_vars/sk-tomnext-hp.yml
index 2db59ed3..8975e5a3 100644
--- a/inventory/host_vars/sk-tomnext-hp.yml
+++ b/inventory/host_vars/sk-tomnext-hp.yml
@@ -6,8 +6,8 @@ ssh_users_root:
 
 install:
   vm:
-    mem: 8192
-    numcpu: 4
+    memory: 8G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml
index 9b041b62..340795eb 100644
--- a/inventory/host_vars/sk-tomnext-nc.yml
+++ b/inventory/host_vars/sk-tomnext-nc.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 16384
-    numcpu: 8
+    memory: 16G
+    numcpus: 8
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/host_vars/sk-tomnext.yml b/inventory/host_vars/sk-tomnext.yml
index eca2de34..3702bd54 100644
--- a/inventory/host_vars/sk-tomnext.yml
+++ b/inventory/host_vars/sk-tomnext.yml
@@ -4,7 +4,12 @@ install:
     credentials: "{{ vault_hroot_robot_account }}"
     server_name: "{{ host_name }}"
   disks:
-    layout: nvme_raid
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/nvme0n1
+      - /dev/nvme1n1
     root_lvm_size: 10G
 
 network:
diff --git a/inventory/host_vars/sk-torrent.yml b/inventory/host_vars/sk-torrent.yml
index 96ddfc4f..c8967dab 100644
--- a/inventory/host_vars/sk-torrent.yml
+++ b/inventory/host_vars/sk-torrent.yml
@@ -1,8 +1,8 @@
 ---
 install:
   vm:
-    mem: 4096
-    numcpu: 4
+    memory: 4G
+    numcpus: 4
     autostart: True
   disks:
     primary: /dev/sda
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 3718d7d2..bd6add33 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -28,6 +28,7 @@ ch-nic host_name=nic
 ch-hroottest host_name=hroot-test
 ch-hroottest-vm1 host_name=hroot-test-vm1
 ch-hroottest-obsd host_name=hroot-test-obsd
+ch-oulu host_name=oulu host_domain=helsinki.at
 
 [chaos-at-home:children]
 mz-chaos-at-home