1 files changed, 18 insertions, 15 deletions
diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
index 52eb0d44..e166a78f 100644
--- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
+++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
@@ -65,34 +65,35 @@ autoinstall:
       number: 1
       size: {{ ubuntu_autoinstall_efi_esp_size | human_to_bytes }}
       grub_device: true
+    - id: format-esp
+      type: format
+      volume: partition-esp
+      label: efi
+      fstype: fat32
+    - id: mount-esp
+      type: mount
+      device: format-esp
+      path: /boot/efi
 {%   else %}
 {%     for raid_member in install_cooked.disks.raid.members %}
-    - id: raid-partition-esp{{ loop.index }}
+    - id: partition-esp{{ loop.index }}
       type: partition
       device: raid-disk{{ loop.index }}
       flag: boot
       number: 1
       size: {{ ubuntu_autoinstall_efi_esp_size | human_to_bytes }}
       grub_device: true
-{%     endfor %}
-    - id: partition-esp
-      type: raid
-      raidlevel: {{ install_cooked.disks.raid.level }}
-      metadata: 0.90
-      devices:
-{%     for raid_member in install_cooked.disks.raid.members %}
-      - raid-partition-esp{{ loop.index }}
-{%     endfor %}
-{%   endif %}
-    - id: format-esp
+    - id: format-esp{{ loop.index }}
       type: format
-      volume: partition-esp
+      volume: partition-esp{{ loop.index }}
       label: efi
       fstype: fat32
-    - id: mount-esp
+    - id: mount-esp{{ loop.index }}
       type: mount
-      device: format-esp
+      device: format-esp{{ loop.index }}
       path: /boot/efi
+{%     endfor %}
+{%   endif %}
 
 {% else %}
 {%   set part_offset = 0 %}
@@ -107,6 +108,7 @@ autoinstall:
 {%   endfor %}
     - id: partition-boot
       type: raid
+      name: md-boot
       raidlevel: {{ install_cooked.disks.raid.level }}
       devices:
 {%   for raid_member in install_cooked.disks.raid.members %}
@@ -159,6 +161,7 @@ autoinstall:
 {%   endfor %}
     - id: partition-lvm
       type: raid
+      name: md-lvm
       raidlevel: {{ install_cooked.disks.raid.level }}
       devices:
 {%   for raid_member in install_cooked.disks.raid.members %}