Merge ~newell-jensen/maas:2.5-lp1811986 into maas:2.5

[Newell Jensen]

Backport of 87ee20a2df65a821ce3f5fd788436777c1438e87

LP: #1811986 -- Disable serial console logging for s390x.

[Newell Jensen (newell-jensen)]

Self approved backport

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b 2.5-lp1811986 lp:~newell-jensen/maas/+git/maas into -b 2.5 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5468/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b 2.5-lp1811986 lp:~newell-jensen/maas/+git/maas into -b 2.5 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5469/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b 2.5-lp1811986 lp:~newell-jensen/maas/+git/maas into -b 2.5 lp:~maas-committers/maas

STATUS: FAILED MERGE
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-lander/410625/console

diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
index 82ecda8..c99c18c 100644
--- a/src/provisioningserver/drivers/pod/virsh.py
+++ b/src/provisioningserver/drivers/pod/virsh.py
@@ -1,4 +1,4 @@
-# Copyright 2017-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2017-2019 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Virsh pod driver."""
@@ -222,10 +222,6 @@ DOM_TEMPLATE_S390X = dedent("""
         <pae/>
       </features>
       <devices>
-        <serial type='pty'>
-          <log file="/var/log/libvirt/qemu/{name}-serial0.log" append="off" />
-          <target port='0'/>
-        </serial>
         <console type='pty'>
           <target type='sclp' port='0'/>
           <alias name='console0'/>