From: Manuel Buil <mbuil@suse.com>
Date: Wed, 31 Oct 2018 17:44:37 +0000 (+0100)
Subject: Simplify the serial config
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F64333%2F2;p=releng-xci.git

Simplify the serial config

The current configuration only dumps the booting info into a file and
the pty does not work (i.e. virsh console opnfv returns a failure
because it cannot find a character device). After some investigations,
it is apparently impossible to have both active:

https://github.com/Mirantis/virtlet/issues/249

Therefore, we should remove the pty part of the xml. To connect to the
VM in case of network problems, we can always use vnc.

Apart from that, the console part is not necessary as libvirt will
create that one for us

Change-Id: I80a59163b4ba4e6bff34cb5378893201e93ddb87
Signed-off-by: Manuel Buil <mbuil@suse.com>
---

diff --git a/xci/playbooks/roles/create-nodes/templates/vm.xml.j2 b/xci/playbooks/roles/create-nodes/templates/vm.xml.j2
index 6061fc52..9fad42b8 100644
--- a/xci/playbooks/roles/create-nodes/templates/vm.xml.j2
+++ b/xci/playbooks/roles/create-nodes/templates/vm.xml.j2
@@ -59,19 +59,9 @@
     </video>
     <serial type='file'>
       <source path='{{ vm_log_file }}'/>
-      <target port='0'/>
-      <alias name='serial0'/>
-    </serial>
-    <serial type='pty'>
-      <source path='/dev/pts/49'/>
       <target port='1'/>
       <alias name='serial1'/>
     </serial>
-    <console type='file'>
-      <source path='{{ vm_log_file }}'/>
-      <target type='serial' port='0'/>
-      <alias name='serial0'/>
-    </console>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </memballoon>