From 925e9b463de689b1e58781b2c59cce47c9d1b455 Mon Sep 17 00:00:00 2001
From: Martin Krizek <mkrizek@redhat.com>
Date: Thu, 5 Jan 2017 18:00:47 +0000
Subject: [PATCH] Remove no longer needed hotfix

---
 .../files/domain-template.jinja-hotfix        | 66 -------------------
 .../taskotron/taskotron-client/tasks/main.yml |  4 --
 2 files changed, 70 deletions(-)
 delete mode 100644 roles/taskotron/taskotron-client/files/domain-template.jinja-hotfix

diff --git a/roles/taskotron/taskotron-client/files/domain-template.jinja-hotfix b/roles/taskotron/taskotron-client/files/domain-template.jinja-hotfix
deleted file mode 100644
index 6e6afcd5e9..0000000000
--- a/roles/taskotron/taskotron-client/files/domain-template.jinja-hotfix
+++ /dev/null
@@ -1,66 +0,0 @@
-<domain type='kvm'>
-    <name>{{ domain_name }}</name>
-    <uuid>{{ uuid }}</uuid>
-    <memory unit='KiB'>{{ memory }}</memory>
-    <currentMemory unit='KiB'>{{ memory }}</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>kvm64</model>
-  </cpu>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-kvm</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source file="{{ disk }}"/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
-    </disk>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source file="{{ seed }}"/>
-      <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
-    </disk>
-    <interface type='network'>
-        <mac address="{{ mac_address }}"/>
-      <source network='default'/>
-      <model type='rtl8139'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </interface>
-    <serial type='pty'>
-      <target port='0'/>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <input type='keyboard' bus='ps2'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
-    </memballoon>
-    <graphics type='spice' port='5900' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-    </graphics>
-    <video>
-      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
-      <alias name='video0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </video>
-  </devices>
-</domain>
-
diff --git a/roles/taskotron/taskotron-client/tasks/main.yml b/roles/taskotron/taskotron-client/tasks/main.yml
index 6bafa17d87..4b48232e4b 100644
--- a/roles/taskotron/taskotron-client/tasks/main.yml
+++ b/roles/taskotron/taskotron-client/tasks/main.yml
@@ -92,10 +92,6 @@
   copy: src=default.xml dest=/etc/libvirt/qemu/networks/default.xml owner=root group=root mode=0600
   when: deployment_type in ['dev', 'stg', 'prod']
 
-- name: copy hotfixed domain template to add graphics card
-  copy: src=domain-template.jinja-hotfix dest=/var/lib/testcloud/domain-template.jinja owner=qemu group=testcloud mode=0764
-  when: deployment_type in ['dev', 'stg']
-
 - name: hotfix libtaskotron to set longer timeout for testcloud, this should be temporary fix though :/
   replace: dest=/usr/lib/python2.7/site-packages/libtaskotron/ext/disposable/vm.py regexp=', timeout=60\):' replace=', timeout=120):' backup=yes
   when: deployment_type in ['dev', 'stg', 'prod']