From 36f29f709e4dd7987888a01b046fab414e0d698b Mon Sep 17 00:00:00 2001
From: Nadav Goldin <ngoldin@redhat.com>
Date: Sun, 23 Apr 2017 11:17:22 +0300
Subject: [PATCH 1/2] Use a separate template domain for el6 distro

Signed-off-by: Nadav Goldin <ngoldin@redhat.com>
---
 .../libvirt/templates/dom_template-el6.xml    | 46 +++++++++++++++++++
 lago/providers/libvirt/vm.py                  |  9 +++-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 lago/providers/libvirt/templates/dom_template-el6.xml

diff --git a/lago/providers/libvirt/templates/dom_template-el6.xml b/lago/providers/libvirt/templates/dom_template-el6.xml
new file mode 100644
index 00000000..d60d1197
--- /dev/null
+++ b/lago/providers/libvirt/templates/dom_template-el6.xml
@@ -0,0 +1,46 @@
+<domain type='kvm'>
+    <name>@NAME@</name>
+    <memory unit='MiB'>@MEM_SIZE@</memory>
+    <iothreads>1</iothreads>
+    <os>
+      <type arch='x86_64' machine='pc'>hvm</type>
+      <bootmenu enable='no'/>
+    </os>
+    <features>
+      <acpi/>
+      <apic/>
+      <pae/>
+      <vmport state='off'/>
+    </features>
+    <devices>
+      <emulator>@QEMU_KVM@</emulator>
+      <memballoon model='none'/>
+      <controller type='usb' model='none'>
+      </controller>
+      <disk type='file' device='disk'>
+        <driver name='qemu' type='qcow2'/>
+        <source file='DISK_PATH'/>
+        <target dev='DISK_DEV' bus='virtio'/>
+      </disk>
+      <channel type='unix'>
+        <source mode='bind'/>
+        <target type='virtio' name='org.qemu.guest_agent.0'/>
+      </channel>
+      <rng model='virtio'>
+        <backend model='random'>/dev/random</backend>
+        <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
+      </rng>
+      <console type='pty'>
+        <target type='virtio' port='0'/>
+      </console>
+      <video>
+        <model type='cirrus' vram='16384' heads='1'/>
+        <alias name='video0'/>
+        <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+      </video>
+    </devices>
+    <clock offset='utc'>
+      <timer name='kvmclock'>
+      </timer>
+    </clock>
+</domain>
diff --git a/lago/providers/libvirt/vm.py b/lago/providers/libvirt/vm.py
index ef214290..d293ab72 100644
--- a/lago/providers/libvirt/vm.py
+++ b/lago/providers/libvirt/vm.py
@@ -368,11 +368,18 @@ def cpu_vendor(self):
         """
         return self._cpu.vendor
 
+    def _load_domain_xml(self):
+        if self.vm.distro() == 'el6':
+            dom_raw_xml = libvirt_utils.get_template('dom_template-el6.xml')
+        else:
+            dom_raw_xml = libvirt_utils.get_template('dom_template.xml')
+        return dom_raw_xml
+
     def _libvirt_name(self):
         return self.vm.virt_env.prefixed_name(self.vm.name())
 
     def _libvirt_xml(self):
-        dom_raw_xml = libvirt_utils.get_template('dom_template.xml')
+        dom_raw_xml = self._load_domain_xml()
 
         qemu_kvm_path = self._caps.findtext(
             "guest[os_type='hvm']/arch[@name='x86_64']/domain[@type='kvm']"

From d522b5944e1974b9a5c06e1be2b0dd8d8d359ab5 Mon Sep 17 00:00:00 2001
From: Nadav Goldin <ngoldin@redhat.com>
Date: Sun, 23 Apr 2017 11:18:35 +0300
Subject: [PATCH 2/2] Switch back to serial console in for el6

virtio console doesn't work well(causes extremely long booting time)

Signed-off-by: Nadav Goldin <ngoldin@redhat.com>
---
 lago/providers/libvirt/templates/dom_template-el6.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lago/providers/libvirt/templates/dom_template-el6.xml b/lago/providers/libvirt/templates/dom_template-el6.xml
index d60d1197..9a7b08c1 100644
--- a/lago/providers/libvirt/templates/dom_template-el6.xml
+++ b/lago/providers/libvirt/templates/dom_template-el6.xml
@@ -26,12 +26,15 @@
         <source mode='bind'/>
         <target type='virtio' name='org.qemu.guest_agent.0'/>
       </channel>
+      <serial type='pty'>
+          <target port='0'/>
+      </serial>
       <rng model='virtio'>
         <backend model='random'>/dev/random</backend>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
       </rng>
       <console type='pty'>
-        <target type='virtio' port='0'/>
+        <target type='serial' port='0'/>
       </console>
       <video>
         <model type='cirrus' vram='16384' heads='1'/>