OpenStack Compute (nova)

Merge lp:~gandelman-a/nova/libvirt_refresh_2 into lp:~ubuntu-server-dev/nova/essex

  1. libvirt_refresh_2
  2. Merge into essex
Proposed by Adam Gandelman on 2012-03-01
Status: Merged
Merge reported by: Chuck Short
Merged at revision: not available
Proposed branch: lp:~gandelman-a/nova/libvirt_refresh_2
Merge into: lp:~ubuntu-server-dev/nova/essex
Diff against target: 105 lines (+22/-22)
1 file modified
debian/patches/libvirt-use-console-pipe.patch (+22/-22)
To merge this branch: bzr merge lp:~gandelman-a/nova/libvirt_refresh_2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2012-03-01 Pending
Review via email: mp+95295@code.launchpad.net
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/patches/libvirt-use-console-pipe.patch'
2--- debian/patches/libvirt-use-console-pipe.patch 2012-02-28 19:12:05 +0000
3+++ debian/patches/libvirt-use-console-pipe.patch 2012-03-01 01:32:18 +0000
4@@ -1,19 +1,19 @@
5-Index: nova-src/Authors
6+Index: nova/Authors
7 ===================================================================
8---- nova-src.orig/Authors 2012-02-28 10:30:58.000000000 -0800
9-+++ nova-src/Authors 2012-02-28 10:32:36.086640111 -0800
10-@@ -147,6 +147,7 @@
11- Rick Clark <rick@openstack.org>
12+--- nova.orig/Authors 2012-02-29 13:34:24.914358872 -0800
13++++ nova/Authors 2012-02-29 13:37:15.602351362 -0800
14+@@ -150,6 +150,7 @@
15 Rick Harris <rconradharris@gmail.com>
16 Rob Kost <kost@isi.edu>
17+ Robert Esker <esker@netapp.com>
18 +Robie Basak <robie.basak@canonical.com>
19 Russell Bryant <rbryant@redhat.com>
20 Russell Sim <russell.sim@gmail.com>
21 Ryan Lane <rlane@wikimedia.org>
22-Index: nova-src/nova/tests/test_libvirt.py
23+Index: nova/nova/tests/test_libvirt.py
24 ===================================================================
25---- nova-src.orig/nova/tests/test_libvirt.py 2012-02-28 10:30:58.000000000 -0800
26-+++ nova-src/nova/tests/test_libvirt.py 2012-02-28 10:32:36.086640111 -0800
27+--- nova.orig/nova/tests/test_libvirt.py 2012-02-29 13:34:25.094358864 -0800
28++++ nova/nova/tests/test_libvirt.py 2012-02-29 13:36:49.298352518 -0800
29 @@ -872,7 +872,7 @@
30 (lambda t: _ipv4_like(t.findall(parameter)[1].get('value'),
31 '192.168.*.1'), True),
32@@ -77,10 +77,10 @@
33 + os.unlink(self.ringbuffer_path)
34 + os.unlink(self.fifo_path)
35 + os.rmdir(self.directory_path)
36-Index: nova-src/nova/tests/test_utils.py
37+Index: nova/nova/tests/test_utils.py
38 ===================================================================
39---- nova-src.orig/nova/tests/test_utils.py 2012-02-28 10:00:07.000000000 -0800
40-+++ nova-src/nova/tests/test_utils.py 2012-02-28 10:32:36.086640111 -0800
41+--- nova.orig/nova/tests/test_utils.py 2012-02-29 13:34:25.102358863 -0800
42++++ nova/nova/tests/test_utils.py 2012-02-29 13:36:49.298352518 -0800
43 @@ -17,6 +17,7 @@
44 import __builtin__
45 import datetime
46@@ -97,7 +97,7 @@
47
48 import nova
49 from nova import exception
50-@@ -813,6 +815,57 @@
51+@@ -818,6 +820,57 @@
52 west = utils.parse_isotime(str)
53 normed = utils.normalize_time(west)
54 self._instaneous(normed, 2012, 2, 13, 23, 53, 07, 0)
55@@ -155,10 +155,10 @@
56
57
58 class TestLockCleanup(test.TestCase):
59-Index: nova-src/nova/utils.py
60+Index: nova/nova/utils.py
61 ===================================================================
62---- nova-src.orig/nova/utils.py 2012-02-28 10:30:58.000000000 -0800
63-+++ nova-src/nova/utils.py 2012-02-28 10:32:36.090640111 -0800
64+--- nova.orig/nova/utils.py 2012-02-29 13:34:25.106358862 -0800
65++++ nova/nova/utils.py 2012-02-29 13:36:49.302352518 -0800
66 @@ -33,6 +33,7 @@
67 import shlex
68 import shutil
69@@ -175,7 +175,7 @@
70 LOG = logging.getLogger(__name__)
71 ISO_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
72 PERFECT_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
73-@@ -1525,6 +1527,135 @@
74+@@ -1530,6 +1532,135 @@
75 return out
76 except exception.ProcessExecutionError:
77 raise exception.FileNotFound(file_path=file_path)
78@@ -311,10 +311,10 @@
79
80
81 @contextlib.contextmanager
82-Index: nova-src/nova/virt/libvirt/connection.py
83+Index: nova/nova/virt/libvirt/connection.py
84 ===================================================================
85---- nova-src.orig/nova/virt/libvirt/connection.py 2012-02-28 10:30:58.000000000 -0800
86-+++ nova-src/nova/virt/libvirt/connection.py 2012-02-28 10:32:36.090640111 -0800
87+--- nova.orig/nova/virt/libvirt/connection.py 2012-02-29 13:34:25.110358862 -0800
88++++ nova/nova/virt/libvirt/connection.py 2012-02-29 13:36:49.302352518 -0800
89 @@ -39,15 +39,19 @@
90
91 """
92@@ -508,10 +508,10 @@
93
94 if not disk_images:
95 disk_images = {'image_id': instance['image_ref'],
96-Index: nova-src/nova/virt/libvirt.xml.template
97+Index: nova/nova/virt/libvirt.xml.template
98 ===================================================================
99---- nova-src.orig/nova/virt/libvirt.xml.template 2012-02-28 10:30:58.000000000 -0800
100-+++ nova-src/nova/virt/libvirt.xml.template 2012-02-28 10:32:36.094640111 -0800
101+--- nova.orig/nova/virt/libvirt.xml.template 2012-02-29 13:34:25.110358862 -0800
102++++ nova/nova/virt/libvirt.xml.template 2012-02-29 13:36:49.302352518 -0800
103 @@ -160,8 +160,8 @@
104
105 #end for

Subscribers

People subscribed via source and target branches