From eb44a82979b4886b2cca15a216fecb42ca1243ef Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 18 Mar 2016 15:34:23 -0700
Subject: [PATCH] openqa/server: run createhdds with python3

there seems to be a bug in python2-guestfs which causes the
disk image with an updates.img file to be broken (the updates
image is only 4096 bytes long and incomplete). When built with
Python 3 the image seems to be fine. So, run the script with
python3 (as its hashbang says) and ensure necessary packages
are installed.
---
 roles/openqa/server/tasks/main.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index df3b1a5daf..1725e26586 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -55,6 +55,7 @@
   dnf: name={{ item }} state=present enablerepo="updates-testing"
   with_items:
   - python2-fedfind
+  - python3-fedfind
   - openqa
   - openqa-httpd
   - openqa-plugin-fedmsg
@@ -75,8 +76,8 @@
   - expect
   - libguestfs-tools-c
   - libguestfs-xfs
-  - python2-pexpect
-  - python-libguestfs
+  - python3-libguestfs
+  - python3-pexpect
   tags:
   - packages
 
@@ -101,7 +102,7 @@
   - /var/lib/openqa/share/factory/repo
 
 - name: Check if any hard disk images need (re)building
-  command: "python /root/openqa_fedora_tools/tools/createhdds.py check"
+  command: "/root/openqa_fedora_tools/tools/createhdds.py check"
   args:
     chdir: /var/lib/openqa/share/factory/hdd/
   register: diskcheck
@@ -110,7 +111,7 @@
   always_run: true
 
 - name: Create hard disk images (this may take a long time!)
-  command: "python /root/openqa_fedora_tools/tools/createhdds.py all --clean"
+  command: "/root/openqa_fedora_tools/tools/createhdds.py all --clean"
   args:
     chdir: /var/lib/openqa/share/factory/hdd/
   environment: