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
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.
3434
35LP: #1718209 Fix IPv6 DHCP PXE configuration.35LP: #1718209 Fix IPv6 DHCP PXE configuration.
3636
37LP: #1688066 Add Spice graphical console to pod created VM's
38
3739
382.2.2402.2.2
39=====41=====
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("""\
92 <console type='pty'>92 <console type='pty'>
93 <target type='serial' port='0'/>93 <target type='serial' port='0'/>
94 </console>94 </console>
95 <channel type='spicevmc'>
96 <target type='virtio' name='com.redhat.spice.0'/>
97 <address type='virtio-serial' controller='0' bus='0' port='1'/>
98 </channel>
99 <graphics type='spice' autoport='yes'>
100 <image compression='off'/>
101 </graphics>
95 <input type='mouse' bus='ps2'/>102 <input type='mouse' bus='ps2'/>
96 <input type='keyboard' bus='ps2'/>103 <input type='keyboard' bus='ps2'/>
97 </devices>104 </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
42traitlets = 4.3.142traitlets = 4.3.1
43unittest2 = 1.1.043unittest2 = 1.1.0
44wcwidth = 0.1.744wcwidth = 0.1.7
45zc.buildout = 2.9.445zc.buildout = 2.9.5
46zc.recipe.egg = 2.0.346zc.recipe.egg = 2.0.3
4747
48# Lint.48# Lint.

Subscribers

People subscribed via source and target branches