Merge ~andreserl/maas:2.2 into maas:2.2

Proposed by Andres Rodriguez on 2017-09-26
Status: Merged
Approved by: Andres Rodriguez on 2017-09-26
Approved revision: c36e19e18889060f37f06500aa942e04da943844
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:2.2
Merge into: maas:2.2
Diff against target: 44 lines (+10/-1)
3 files modified
docs/changelog.rst (+2/-0)
src/provisioningserver/drivers/pod/virsh.py (+7/-0)
versions.cfg (+1/-1)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2017-09-26
Review via email: mp+331363@code.launchpad.net

Commit message

Backport 56e58b6cf790ae974f2524a6ded88d0ff0ca3270 from master.

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

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve
~andreserl/maas:2.2 updated on 2017-09-26
c36e19e... by Andres Rodriguez on 2017-09-26

Fix versions.cfg

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/docs/changelog.rst b/docs/changelog.rst
2index f8ebd64..4945607 100644
3--- a/docs/changelog.rst
4+++ b/docs/changelog.rst
5@@ -34,6 +34,8 @@ LP: #1717287 maas-enlist not supporting IPv6 addresses in server_url.
6
7 LP: #1718209 Fix IPv6 DHCP PXE configuration.
8
9+LP: #1688066 Add Spice graphical console to pod created VM's
10+
11
12 2.2.2
13 =====
14diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
15index 988ebb4..043b34d 100644
16--- a/src/provisioningserver/drivers/pod/virsh.py
17+++ b/src/provisioningserver/drivers/pod/virsh.py
18@@ -92,6 +92,13 @@ DOM_TEMPLATE = dedent("""\
19 <console type='pty'>
20 <target type='serial' port='0'/>
21 </console>
22+ <channel type='spicevmc'>
23+ <target type='virtio' name='com.redhat.spice.0'/>
24+ <address type='virtio-serial' controller='0' bus='0' port='1'/>
25+ </channel>
26+ <graphics type='spice' autoport='yes'>
27+ <image compression='off'/>
28+ </graphics>
29 <input type='mouse' bus='ps2'/>
30 <input type='keyboard' bus='ps2'/>
31 </devices>
32diff --git a/versions.cfg b/versions.cfg
33index 561d427..e3e87a6 100644
34--- a/versions.cfg
35+++ b/versions.cfg
36@@ -42,7 +42,7 @@ traceback2 = 1.4.0
37 traitlets = 4.3.1
38 unittest2 = 1.1.0
39 wcwidth = 0.1.7
40-zc.buildout = 2.9.4
41+zc.buildout = 2.9.5
42 zc.recipe.egg = 2.0.3
43
44 # Lint.

Subscribers

People subscribed via source and target branches