Change: tagging for new vmdb2

1 files changed, 15 insertions, 29 deletions

diff --git a/v-i.vmdb b/v-i.vmdb
index 5dc420d..e2a64c3 100644
--- a/v-i.vmdb
+++ b/v-i.vmdb
@@ -13,46 +13,38 @@ steps:
     device: "{{ output }}"
     start: 0%
     end: 1G
-    part-tag: efi-part
+    tag: efi
 
   - mkpart: primary
     device: "{{ output }}"
     start: 1G
     end: 100%
-    part-tag: root-part
+    tag: rootfs
 
-  - mkfs: vfat
-    partition: efi-part
-
-  # - mklabel: msdos
-  #   device: "{{ output }}"
+  - kpartx: "{{ output }}"
 
-  # - mkpart: primary
-  #   device: "{{ output }}"
-  #   start: 0%
-  #   end: 100%
-  #   part-tag: root-part
+  - mkfs: vfat
+    partition: efi
 
   - mkfs: ext4
-    partition: root-part
+    partition: rootfs
 
-  - mount: root-part
-    fs-tag: root-fs
+  - mount: rootfs
 
-  - unpack-rootfs: root-fs
+  - unpack-rootfs: rootfs
 
   - debootstrap: unstable
     mirror: http://deb.debian.org/debian
-    target: root-fs
+    target: rootfs
     unless: rootfs_unpacked
 
   - apt: install
     packages:
       - linux-image-amd64
-    fs-tag: root-fs
+    tag: root
     unless: rootfs_unpacked
 
-  - cache-rootfs: root-fs
+  - cache-rootfs: rootfs
     unless: rootfs_unpacked
 
   - apt: install
@@ -70,17 +62,11 @@ steps:
       - pass
       - lvm2
       - dosfstools
-    fs-tag: root-fs
+    tag: rootfs
 
-  - ansible: root-fs
+  - ansible: rootfs
     playbook: v-i.yml
 
-  # - grub: bios
-  #   root-fs: root-fs
-  #   root-part: root-part
-  #   device: "{{ output }}"
-
   - grub: uefi
-    root-fs: root-fs
-    root-part: root-part
-    efi-part: efi-part
+    tag: rootfs
+    efi: efi