OpenStack Compute (nova)

Merge lp:~james-page/nova/libvirt-configs into lp:~ubuntu-server-dev/nova/icehouse

  1. libvirt-configs
  2. Merge into icehouse
Proposed by James Page
Status: Merged
Approved by: Chuck Short
Approved revision: 637
Merged at revision: 637
Proposed branch: lp:~james-page/nova/libvirt-configs
Merge into: lp:~ubuntu-server-dev/nova/icehouse
Diff against target: 67 lines (+15/-5)
6 files modified
debian/changelog (+5/-0)
debian/nova-compute-kvm.conf (+2/-1)
debian/nova-compute-lxc.conf (+2/-1)
debian/nova-compute-qemu.conf (+2/-1)
debian/nova-compute-uml.conf (+2/-1)
debian/nova-compute-xen.conf (+2/-1)
To merge this branch: bzr merge lp:~james-page/nova/libvirt-configs
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+198446@code.launchpad.net

Description of the change

Update hypervisor configuration for libvirt to use new style virt_type and libvirt section

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-12-09 15:36:55 +0000
3+++ debian/changelog 2013-12-10 18:28:25 +0000
4@@ -1,8 +1,13 @@
5 nova (1:2014.1~b1+master-0ubuntu1) UNRELEASED; urgency=low
6
7+ [ Chuck Short ]
8 * debian/patches/fix-libvirt-regression.patch: Dropped.
9 * debian/patches/sqlachemy-0.8.3-compat.patch: Refreshed.
10
11+ [ James Page ]
12+ * d/nova-compute-*.conf: Update default hypervisor configurations
13+ to use new libvirt section configuration.
14+
15 -- Chuck Short <zulcss@ubuntu.com> Thu, 05 Dec 2013 15:08:16 -0500
16
17 nova (1:2014.1~b1-0ubuntu1) trusty; urgency=low
18
19=== modified file 'debian/nova-compute-kvm.conf'
20--- debian/nova-compute-kvm.conf 2012-12-19 22:16:17 +0000
21+++ debian/nova-compute-kvm.conf 2013-12-10 18:28:25 +0000
22@@ -1,3 +1,4 @@
23 [DEFAULT]
24-libvirt_type=kvm
25 compute_driver=libvirt.LibvirtDriver
26+[libvirt]
27+virt_type=kvm
28
29=== modified file 'debian/nova-compute-lxc.conf'
30--- debian/nova-compute-lxc.conf 2012-12-19 22:16:17 +0000
31+++ debian/nova-compute-lxc.conf 2013-12-10 18:28:25 +0000
32@@ -1,3 +1,4 @@
33 [DEFAULT]
34-libvirt_type=lxc
35 compute_driver=libvirt.LibvirtDriver
36+[libvirt]
37+virt_type=lxc
38
39=== modified file 'debian/nova-compute-qemu.conf'
40--- debian/nova-compute-qemu.conf 2012-12-19 22:16:17 +0000
41+++ debian/nova-compute-qemu.conf 2013-12-10 18:28:25 +0000
42@@ -1,3 +1,4 @@
43 [DEFAULT]
44-libvirt_type=qemu
45 compute_driver=libvirt.LibvirtDriver
46+[libvirt]
47+virt_type=qemu
48
49=== modified file 'debian/nova-compute-uml.conf'
50--- debian/nova-compute-uml.conf 2012-12-19 22:16:17 +0000
51+++ debian/nova-compute-uml.conf 2013-12-10 18:28:25 +0000
52@@ -1,3 +1,4 @@
53 [DEFAULT]
54-libvirt_type=uml
55 compute_driver=libvirt.LibvirtDriver
56+[libvirt]
57+virt_type=uml
58
59=== modified file 'debian/nova-compute-xen.conf'
60--- debian/nova-compute-xen.conf 2012-12-19 22:16:17 +0000
61+++ debian/nova-compute-xen.conf 2013-12-10 18:28:25 +0000
62@@ -1,3 +1,4 @@
63 [DEFAULT]
64-libvirt_type=xen
65 compute_driver=libvirt.LibvirtDriver
66+[libvirt]
67+virt_type=xen

Subscribers

People subscribed via source and target branches