Change: x220.vmdb to work with current vmdb2

2 files changed, 16 insertions, 8 deletions

diff --git a/v-i.yml b/v-i.yml
index 89fa7d2..6eea07f 100644
--- a/v-i.yml
+++ b/v-i.yml
@@ -53,5 +53,15 @@
         src: /home/liw/data/v-i/unstable.tar.gz
         dest: /root/unstable.tar.gz
 
+    - name: "copy my ssh pub key"
+      copy:
+        src: /home/liw/.ssh/liw-openpgp.pub
+        dest: /root/liw-openpgp.pub
+
+    - name: "add my ssh pub key to root's authorized keys"
+      authorized_key:
+        user: root
+        key: "{{ lookup('file', '/home/liw/.ssh/liw-openpgp.pub') }}"
+
   vars:
     hostname: v-i
diff --git a/x220.vmdb b/x220.vmdb
index 160b805..2c1ba2c 100644
--- a/x220.vmdb
+++ b/x220.vmdb
@@ -9,13 +9,13 @@ steps:
     device: "{{ image }}"
     start: 0%
     end: 1G
-    part-tag: efi-part
+    tag: efi-part
 
   - mkpart: primary
     device: "{{ image }}"
     start: 1G
     end: 100%
-    part-tag: root-part
+    tag: root-part
 
   - mkfs: vfat
     partition: efi-part
@@ -24,7 +24,6 @@ steps:
     partition: root-part
 
   - mount: root-part
-    fs-tag: root-fs
 
   - unpack-rootfs: root-fs
 
@@ -36,7 +35,7 @@ steps:
   - apt: install
     packages:
       - linux-image-amd64
-    fs-tag: root-fs
+    tag: root-fs
     unless: rootfs_unpacked
 
   - cache-rootfs: root-fs
@@ -48,13 +47,12 @@ steps:
       - console-setup
       - locales-all
       - ifupdown
-    fs-tag: root-fs
+    tag: root-fs
 
   - ansible: root-fs
     playbook: x220.yml
 
   - grub: uefi
-    root-fs: root-fs
-    root-part: root-part
-    efi-part: efi-part
+    tag: root-fs
+    efi: efi-part
     image-dev: "{{ image }}"