Ubuntu
nova package

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

  1. Precise (12.04)
  2. lp940780
  3. Merge into essex
Proposed by Adam Gandelman
Status: Merged
Merge reported by: Chuck Short
Merged at revision: not available
Proposed branch: lp:~gandelman-a/ubuntu/precise/nova/lp940780
Merge into: lp:~ubuntu-server-dev/nova/essex
Diff against target: 169 lines (+48/-28)
3 files modified
debian/changelog (+7/-0)
debian/nova-volume.upstart.in (+3/-0)
debian/patches/libvirt-use-console-pipe.patch (+38/-28)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/precise/nova/lp940780
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+94644@code.launchpad.net

Description of the change

Fixes the nova-volume upstart job, refreshes the libvirt-console patch so it applies cleanly to recent revisions of the unit tests.

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
=== modified file 'debian/changelog'
--- debian/changelog 2012-02-24 15:08:20 +0000
+++ debian/changelog 2012-02-25 06:26:17 +0000
@@ -1,3 +1,10 @@
1nova (2012.1~e4~20120224.12913-0ubuntu2) UNRELEASED; urgency=low
2
3 * debain/nova-volume.upstart.in: Ensure lock directory is created
4 (LP: #940780)
5
6 -- Adam Gandelman <adamg@canonical.com> Fri, 24 Feb 2012 22:14:24 -0800
7
1nova (2012.1~e4~20120224.12913-0ubuntu1) precise; urgency=low8nova (2012.1~e4~20120224.12913-0ubuntu1) precise; urgency=low
29
3 [ Monty Taylor ]10 [ Monty Taylor ]
411
=== modified file 'debian/nova-volume.upstart.in'
--- debian/nova-volume.upstart.in 2012-01-31 18:29:02 +0000
+++ debian/nova-volume.upstart.in 2012-02-25 06:26:17 +0000
@@ -10,6 +10,9 @@
10pre-start script10pre-start script
11 mkdir -p /var/run/nova11 mkdir -p /var/run/nova
12 chown nova:root /var/run/nova/12 chown nova:root /var/run/nova/
13
14 mkdir -p /var/lock/nova
15 chown nova:root /var/lock/nova/
13end script16end script
1417
15exec su -s /bin/sh -c "exec nova-volume --flagfile=/etc/nova/nova.conf" nova18exec su -s /bin/sh -c "exec nova-volume --flagfile=/etc/nova/nova.conf" nova
1619
=== modified file 'debian/patches/libvirt-use-console-pipe.patch'
--- debian/patches/libvirt-use-console-pipe.patch 2012-02-23 01:59:47 +0000
+++ debian/patches/libvirt-use-console-pipe.patch 2012-02-25 06:26:17 +0000
@@ -1,17 +1,19 @@
1diff -Naur nova.orig/Authors nova/Authors1Index: nova/Authors
2--- nova.orig/Authors 2012-02-22 20:57:07.968044568 -05002===================================================================
3+++ nova/Authors 2012-02-22 20:58:15.360044601 -05003--- nova.orig/Authors 2012-02-24 19:29:28.000000000 -0800
4@@ -144,6 +144,7 @@4+++ nova/Authors 2012-02-24 19:30:40.815750120 -0800
5@@ -146,6 +146,7 @@
5 Rick Clark <rick@openstack.org>6 Rick Clark <rick@openstack.org>
6 Rick Harris <rconradharris@gmail.com>7 Rick Harris <rconradharris@gmail.com>
7 Rob Kost <kost@isi.edu>8 Rob Kost <kost@isi.edu>
8+Robie Basak <robie.basak@canonical.com>9+Robie Basak <robie.basak@canonical.com>
9 Russell Bryant <rbryant@redhat.com>10 Russell Bryant <rbryant@redhat.com>
11 Russell Sim <russell.sim@gmail.com>
10 Ryan Lane <rlane@wikimedia.org>12 Ryan Lane <rlane@wikimedia.org>
11 Ryan Lucio <rlucio@internap.com>13Index: nova/nova/tests/test_libvirt.py
12diff -Naur nova.orig/nova/tests/test_libvirt.py nova/nova/tests/test_libvirt.py14===================================================================
13--- nova.orig/nova/tests/test_libvirt.py 2012-02-22 20:57:08.056044568 -050015--- nova.orig/nova/tests/test_libvirt.py 2012-02-24 19:29:28.000000000 -0800
14+++ nova/nova/tests/test_libvirt.py 2012-02-22 20:58:15.360044601 -050016+++ nova/nova/tests/test_libvirt.py 2012-02-24 19:30:40.815750120 -0800
15@@ -872,7 +872,7 @@17@@ -872,7 +872,7 @@
16 (lambda t: _ipv4_like(t.findall(parameter)[1].get('value'),18 (lambda t: _ipv4_like(t.findall(parameter)[1].get('value'),
17 '192.168.*.1'), True),19 '192.168.*.1'), True),
@@ -75,17 +77,19 @@
75+ os.unlink(self.ringbuffer_path)77+ os.unlink(self.ringbuffer_path)
76+ os.unlink(self.fifo_path)78+ os.unlink(self.fifo_path)
77+ os.rmdir(self.directory_path)79+ os.rmdir(self.directory_path)
78diff -Naur nova.orig/nova/tests/test_utils.py nova/nova/tests/test_utils.py80Index: nova/nova/tests/test_utils.py
79--- nova.orig/nova/tests/test_utils.py 2012-02-22 20:57:08.060044569 -050081===================================================================
80+++ nova/nova/tests/test_utils.py 2012-02-22 20:58:15.364044601 -050082--- nova.orig/nova/tests/test_utils.py 2012-02-24 19:29:06.000000000 -0800
81@@ -17,12 +17,14 @@83+++ nova/nova/tests/test_utils.py 2012-02-24 19:30:40.815750120 -0800
84@@ -17,6 +17,7 @@
82 import __builtin__85 import __builtin__
83 import datetime86 import datetime
84 import hashlib87 import hashlib
85+import itertools88+import itertools
86 import os89 import os
87 import StringIO90 import os.path
88 import tempfile91 import socket
92@@ -25,6 +26,7 @@
89 93
90 import iso860194 import iso8601
91 import mox95 import mox
@@ -93,7 +97,7 @@
93 97
94 import nova98 import nova
95 from nova import exception99 from nova import exception
96@@ -811,3 +813,54 @@100@@ -813,6 +815,57 @@
97 west = utils.parse_isotime(str)101 west = utils.parse_isotime(str)
98 normed = utils.normalize_time(west)102 normed = utils.normalize_time(west)
99 self._instaneous(normed, 2012, 2, 13, 23, 53, 07, 0)103 self._instaneous(normed, 2012, 2, 13, 23, 53, 07, 0)
@@ -148,9 +152,13 @@
148+ yield check_buffer, r, expected152+ yield check_buffer, r, expected
149+ r.close()153+ r.close()
150+ f.close()154+ f.close()
151diff -Naur nova.orig/nova/utils.py nova/nova/utils.py155
152--- nova.orig/nova/utils.py 2012-02-22 20:57:08.060044569 -0500156
153+++ nova/nova/utils.py 2012-02-22 20:58:15.364044601 -0500157 class TestLockCleanup(test.TestCase):
158Index: nova/nova/utils.py
159===================================================================
160--- nova.orig/nova/utils.py 2012-02-24 19:29:28.000000000 -0800
161+++ nova/nova/utils.py 2012-02-24 19:30:40.819750120 -0800
154@@ -32,6 +32,7 @@162@@ -32,6 +32,7 @@
155 import re163 import re
156 import shlex164 import shlex
@@ -159,7 +167,7 @@
159 import struct167 import struct
160 import sys168 import sys
161 import time169 import time
162@@ -53,6 +54,7 @@170@@ -54,6 +55,7 @@
163 from nova.openstack.common import cfg171 from nova.openstack.common import cfg
164 172
165 173
@@ -167,7 +175,7 @@
167 LOG = logging.getLogger(__name__)175 LOG = logging.getLogger(__name__)
168 ISO_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S"176 ISO_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
169 PERFECT_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"177 PERFECT_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
170@@ -1434,3 +1436,132 @@178@@ -1523,3 +1525,132 @@
171 return out179 return out
172 except exception.ProcessExecutionError:180 except exception.ProcessExecutionError:
173 raise exception.FileNotFound(file_path=file_path)181 raise exception.FileNotFound(file_path=file_path)
@@ -300,9 +308,10 @@
300+308+
301+ def close(self):309+ def close(self):
302+ self.f.close()310+ self.f.close()
303diff -Naur nova.orig/nova/virt/libvirt/connection.py nova/nova/virt/libvirt/connection.py311Index: nova/nova/virt/libvirt/connection.py
304--- nova.orig/nova/virt/libvirt/connection.py 2012-02-22 20:57:08.064044569 -0500312===================================================================
305+++ nova/nova/virt/libvirt/connection.py 2012-02-22 20:58:15.368044601 -0500313--- nova.orig/nova/virt/libvirt/connection.py 2012-02-24 19:29:28.000000000 -0800
314+++ nova/nova/virt/libvirt/connection.py 2012-02-24 19:30:40.819750120 -0800
306@@ -39,15 +39,19 @@315@@ -39,15 +39,19 @@
307 316
308 """317 """
@@ -468,7 +477,7 @@
468 477
469 @staticmethod478 @staticmethod
470 def get_host_ip_addr():479 def get_host_ip_addr():
471@@ -997,8 +1069,25 @@480@@ -998,8 +1070,25 @@
472 container_dir = '%s/rootfs' % basepath(suffix='')481 container_dir = '%s/rootfs' % basepath(suffix='')
473 libvirt_utils.ensure_tree(container_dir)482 libvirt_utils.ensure_tree(container_dir)
474 483
@@ -496,10 +505,11 @@
496 505
497 if not disk_images:506 if not disk_images:
498 disk_images = {'image_id': instance['image_ref'],507 disk_images = {'image_id': instance['image_ref'],
499diff -Naur nova.orig/nova/virt/libvirt.xml.template nova/nova/virt/libvirt.xml.template508Index: nova/nova/virt/libvirt.xml.template
500--- nova.orig/nova/virt/libvirt.xml.template 2012-02-22 20:57:08.064044569 -0500509===================================================================
501+++ nova/nova/virt/libvirt.xml.template 2012-02-22 20:58:15.364044601 -0500510--- nova.orig/nova/virt/libvirt.xml.template 2012-02-24 19:29:28.000000000 -0800
502@@ -152,8 +152,8 @@511+++ nova/nova/virt/libvirt.xml.template 2012-02-24 19:30:40.819750120 -0800
512@@ -160,8 +160,8 @@
503 513
504 #end for514 #end for
505 <!-- The order is significant here. File must be defined first -->515 <!-- The order is significant here. File must be defined first -->

Subscribers

People subscribed via source and target branches