Merge ~andreserl/maas:2.2 into maas:2.2

[Andres Rodriguez]

Backport 56e58b6cf790ae974f2524a6ded88d0ff0ca3270 from master.

LP: #1688066 - Add Spice graphical console to pod created VM's

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b 2.2 lp:~andreserl/maas into -b 2.2 lp:~maas-committers/maas

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

[MAAS Lander (maas-lander)]

LANDING
-b 2.2 lp:~andreserl/maas into -b 2.2 lp:~maas-committers/maas

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

c36e19e... by Andres Rodriguez on 2017-09-26

Fix versions.cfg

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f8ebd64..4945607 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -34,6 +34,8 @@ LP: #1717287    maas-enlist not supporting IPv6 addresses in server_url.
 
 LP: #1718209    Fix IPv6 DHCP PXE configuration.
 
+LP: #1688066    Add Spice graphical console to pod created VM's
+
 
 2.2.2
 =====
diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
index 988ebb4..043b34d 100644
--- a/src/provisioningserver/drivers/pod/virsh.py
+++ b/src/provisioningserver/drivers/pod/virsh.py
@@ -92,6 +92,13 @@ DOM_TEMPLATE = dedent("""\
         <console type='pty'>
           <target type='serial' port='0'/>
         </console>
+        <channel type='spicevmc'>
+          <target type='virtio' name='com.redhat.spice.0'/>
+          <address type='virtio-serial' controller='0' bus='0' port='1'/>
+        </channel>
+        <graphics type='spice' autoport='yes'>
+          <image compression='off'/>
+        </graphics>
         <input type='mouse' bus='ps2'/>
         <input type='keyboard' bus='ps2'/>
       </devices>
diff --git a/versions.cfg b/versions.cfg
index 561d427..e3e87a6 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -42,7 +42,7 @@ traceback2 = 1.4.0
 traitlets = 4.3.1
 unittest2 = 1.1.0
 wcwidth = 0.1.7
-zc.buildout = 2.9.4
+zc.buildout = 2.9.5
 zc.recipe.egg = 2.0.3
 
 # Lint.