2 files changed, 33 insertions, 0 deletions
diff --git a/ansible/roles/build_yardstick_image/tasks/post_build.yml b/ansible/roles/build_yardstick_image/tasks/post_build.yml
index c6888f8df..abbf57c03 100644
--- a/ansible/roles/build_yardstick_image/tasks/post_build.yml
+++ b/ansible/roles/build_yardstick_image/tasks/post_build.yml
@@ -35,6 +35,10 @@
     state: unmounted
 
 - mount:
+    name: "{{ mountdir }}/run"
+    state: unmounted
+
+- mount:
     name: "{{ mountdir }}"
     state: unmounted
 
@@ -44,3 +48,20 @@
 
 - debug:
     msg: "yardstick image = {{ imgfile }}"
+
+- set_fact:
+    imgdest: "/var/lib/libvirt/images/{{ imgfile | basename}}"
+    name: "{{ (imgfile | basename | splitext)[0] }}"
+    ext: "{{ (imgfile | basename | splitext)[1] }}"
+
+- name: Verify if imgfile exists in libvirt images
+  stat:
+    path: "{{ imgdest }}"
+  register: imgdest_stat
+
+- set_fact:
+    imgdest: "/var/lib/libvirt/images/{{ name }}_autogen{{ ext }}"
+  when: imgdest_stat.stat.exists
+
+- name: Copy image to libvirt images
+  shell: "cp {{ imgfile }} {{ imgdest }}"
diff --git a/ansible/roles/build_yardstick_image/tasks/pre_build.yml b/ansible/roles/build_yardstick_image/tasks/pre_build.yml
index 2dae38060..3ac8e90e9 100644
--- a/ansible/roles/build_yardstick_image/tasks/pre_build.yml
+++ b/ansible/roles/build_yardstick_image/tasks/pre_build.yml
@@ -45,6 +45,7 @@
   with_items:
     # order matters
     - "{{ mountdir }}/proc"
+    - "{{ mountdir }}/run"
     - "{{ mountdir }}"
     - "/mnt/{{ release }}"
 
@@ -178,6 +179,17 @@
     fstab: "{{ fake_fstab }}"
     state: mounted
 
+- name: mount chroot /run
+  mount:
+    src: /run
+    name: "{{ mountdir }}/run"
+    fstype: tmpfs
+    opts: bind
+    # !!!!!!! this is required otherwise we add entries to /etc/fstab
+    # and prevent the system from booting
+    fstab: "{{ fake_fstab }}"
+    state: mounted
+
 - name: if arm copy qemu-aarch64-static into chroot
   copy:
     src: /usr/bin/qemu-aarch64-static