7 files changed, 41 insertions, 14 deletions
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/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..c61dc4e1 100644
--- a/inventory/host_vars/sk-testvm.yml
+++ b/inventory/host_vars/sk-testvm.yml
@@ -11,6 +11,10 @@ install:
         type: zfs
         name: root
         size: 10g
+      sdb:
+        type: zfs
+        name: root2
+        size: 10g
   interfaces:
   - bridge: br-public
     name: primary0
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/roles/cloud/install/templates/hetzner_installimage.conf.j2 b/roles/cloud/install/templates/hetzner_installimage.conf.j2
index 0881b110..ed22f286 100644
--- a/roles/cloud/install/templates/hetzner_installimage.conf.j2
+++ b/roles/cloud/install/templates/hetzner_installimage.conf.j2
@@ -1,15 +1,13 @@
 HOSTNAME {{ host_name }}{% if host_domain %}.{{ host_domain }}{% endif %}{{ '' }}
 {% if cloud_provider == "hroot" %}
-{%   if install_cooked.disks.layout == "nvme_raid" %}
-DRIVE1 /dev/nvme0n1
-DRIVE2 /dev/nvme1n1
+{%   if install_cooked.disks.primary == "software-raid" %}
+{%     for raid_member in install_cooked.disks.raid.members %}
+DRIVE{{ loop.index }} {{ raid_member }}
+{%     endfor %}
 SWRAID 1
-SWRAIDLEVEL 1
-{%   elif install_cooked.disks.layout == "sata_raid" %}
-DRIVE1 /dev/sda
-DRIVE2 /dev/sdb
-SWRAID 1
-SWRAIDLEVEL 1
+SWRAIDLEVEL {{ install_cooked.disks.raid.level }}
+{%   else %}
+DRIVE1 {{ install_cooked.disks.primary }}
 {%   endif %}
 {% elif cloud_provider == "hcloud" %}
 DRIVE1 /dev/sda