OpenStack Compute (nova)

Merge lp:~gandelman-a/nova/debian-merge into lp:~ubuntu-server-dev/nova/debian-merge

  1. debian-merge
  2. Merge into debian-merge
Proposed by Adam Gandelman
Status: Merged
Merge reported by: Chuck Short
Merged at revision: not available
Proposed branch: lp:~gandelman-a/nova/debian-merge
Merge into: lp:~ubuntu-server-dev/nova/debian-merge
Diff against target: 69 lines (+7/-6)
2 files modified
debian/changelog (+1/-0)
debian/control (+6/-6)
To merge this branch: bzr merge lp:~gandelman-a/nova/debian-merge
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+95253@code.launchpad.net

Description of the change

Fixes the nova-compute dependency problem

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 2012-02-29 13:59:22 +0000
3+++ debian/changelog 2012-02-29 19:58:23 +0000
4@@ -4,6 +4,7 @@
5 * debian/patches/libvirt-use-console-pipe.patch: Refreshed.
6 * debain/nova-volume.upstart.in: Ensure lock directory is created
7 (LP: #940780)
8+ * debain/control: Fix nova-compute-$flavor Depends
9
10 [ Chuck Short ]
11 * debian/rules: Fix FTBFS.
12
13=== modified file 'debian/control'
14--- debian/control 2012-02-29 13:59:22 +0000
15+++ debian/control 2012-02-29 19:58:23 +0000
16@@ -156,7 +156,7 @@
17
18 Package: nova-compute-lxc
19 Architecture: all
20-Depends: python-libvirt, libvirt-bin, ${misc:Depends}, adduser, nova-common
21+Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, ${misc:Depends}
22 Provides: nova-compute-hypervisor
23 Description: OpenStack Compute - compute node (LXC)
24 OpenStack is a reliable cloud infrastructure. Its mission is to produce
25@@ -177,7 +177,7 @@
26
27 Package: nova-compute-uml
28 Architecture: all
29-Depends: python-libvirt, libvirt-bin, user-mode-linux, ${misc:Depends}, nova-common
30+Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, user-mode-linux, ${misc:Depends}
31 Provides: nova-compute-hypervisor
32 Description: OpenStack Compute - compute node (UserModeLinux)
33 OpenStack is a reliable cloud infrastructure. Its mission is to produce
34@@ -198,7 +198,7 @@
35
36 Package: nova-compute-xen
37 Architecture: all
38-Depends: nova-common, python-libvirt, libvirt-bin, xen-hypervisor-4.1-amd64 | xen-hypervisor-4.1-i386,
39+Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, xen-hypervisor-4.1-amd64 | xen-hypervisor-4.1-i386,
40 ${misc:Depends}
41 Provides: nova-compute-hypervisor
42 Description: OpenStack Compute - compute node (Xen)
43@@ -220,7 +220,7 @@
44
45 Package: nova-compute-qemu
46 Architecture: all
47-Depends: nova-common, adduser, python-libvirt, libvirt-bin, qemu, ${misc:Depends}
48+Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, qemu, ${misc:Depends}
49 Provides: nova-compute-hypervisor
50 Description: OpenStack Compute - compute node (QEmu)
51 OpenStack is a reliable cloud infrastructure. Its mission is to produce
52@@ -241,7 +241,7 @@
53
54 Package: nova-compute-kvm
55 Architecture: all
56-Depends: nova-common, adduser, python-libvirt, libvirt-bin, kvm, ${misc:Depends}
57+Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, kvm, ${misc:Depends}
58 Provides: nova-compute-hypervisor
59 Description: OpenStack Compute - compute node (KVM)
60 OpenStack is a reliable cloud infrastructure. Its mission is to produce
61@@ -262,7 +262,7 @@
62
63 Package: nova-compute-xcp
64 Architecture: all
65-Depends: python-xenapi, adduser, nova-comon, ${misc:Depends}
66+Depends: nova-compute (= ${binary:Version}), python-xenapi, ${misc:Depends}
67 Provides: nova-compute-hypervisor
68 Description: OpenStack Compute - compute node (XCP)
69 OpenStack is a reliable cloud infrastructure. Its mission is to produce

Subscribers

People subscribed via source and target branches