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

[Adam Gandelman]

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

=== 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 @@
+nova (2012.1~e4~20120224.12913-0ubuntu2) UNRELEASED; urgency=low
+
+  * debain/nova-volume.upstart.in: Ensure lock directory is created
+    (LP: #940780)
+
+ -- Adam Gandelman <[e-mail]>  Fri, 24 Feb 2012 22:14:24 -0800
+
 nova (2012.1~e4~20120224.12913-0ubuntu1) precise; urgency=low
 
   [ Monty Taylor ]

=== 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 @@
 pre-start script
 	mkdir -p /var/run/nova
 	chown nova:root /var/run/nova/
+
+	mkdir -p /var/lock/nova
+	chown nova:root /var/lock/nova/
 end script
 
 exec su -s /bin/sh -c "exec nova-volume --flagfile=/etc/nova/nova.conf" nova

=== 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 @@
-diff -Naur nova.orig/Authors nova/Authors
---- nova.orig/Authors	2012-02-22 20:57:07.968044568 -0500
-+++ nova/Authors	2012-02-22 20:58:15.360044601 -0500
-@@ -144,6 +144,7 @@
+Index: nova/Authors
+===================================================================
+--- nova.orig/Authors	2012-02-24 19:29:28.000000000 -0800
++++ nova/Authors	2012-02-24 19:30:40.815750120 -0800
+@@ -146,6 +146,7 @@
  Rick Clark <[e-mail]>
  Rick Harris <[e-mail]>
  Rob Kost <[e-mail]>
 +Robie Basak <[e-mail]>
  Russell Bryant <[e-mail]>
+ Russell Sim <[e-mail]>
  Ryan Lane <[e-mail]>
- Ryan Lucio <[e-mail]>
-diff -Naur nova.orig/nova/tests/test_libvirt.py nova/nova/tests/test_libvirt.py
---- nova.orig/nova/tests/test_libvirt.py	2012-02-22 20:57:08.056044568 -0500
-+++ nova/nova/tests/test_libvirt.py	2012-02-22 20:58:15.360044601 -0500
+Index: nova/nova/tests/test_libvirt.py
+===================================================================
+--- nova.orig/nova/tests/test_libvirt.py	2012-02-24 19:29:28.000000000 -0800
++++ nova/nova/tests/test_libvirt.py	2012-02-24 19:30:40.815750120 -0800
 @@ -872,7 +872,7 @@
              (lambda t: _ipv4_like(t.findall(parameter)[1].get('value'),
                                    '192.168.*.1'), True),
@@ -75,17 +77,19 @@
 +        os.unlink(self.ringbuffer_path)
 +        os.unlink(self.fifo_path)
 +        os.rmdir(self.directory_path)
-diff -Naur nova.orig/nova/tests/test_utils.py nova/nova/tests/test_utils.py
---- nova.orig/nova/tests/test_utils.py	2012-02-22 20:57:08.060044569 -0500
-+++ nova/nova/tests/test_utils.py	2012-02-22 20:58:15.364044601 -0500
-@@ -17,12 +17,14 @@
+Index: nova/nova/tests/test_utils.py
+===================================================================
+--- nova.orig/nova/tests/test_utils.py	2012-02-24 19:29:06.000000000 -0800
++++ nova/nova/tests/test_utils.py	2012-02-24 19:30:40.815750120 -0800
+@@ -17,6 +17,7 @@
  import __builtin__
  import datetime
  import hashlib
 +import itertools
  import os
- import StringIO
- import tempfile
+ import os.path
+ import socket
+@@ -25,6 +26,7 @@
  
  import iso8601
  import mox
@@ -93,7 +97,7 @@
  
  import nova
  from nova import exception
-@@ -811,3 +813,54 @@
+@@ -813,6 +815,57 @@
          west = utils.parse_isotime(str)
          normed = utils.normalize_time(west)
          self._instaneous(normed, 2012, 2, 13, 23, 53, 07, 0)
@@ -148,9 +152,13 @@
 +            yield check_buffer, r, expected
 +        r.close()
 +        f.close()
-diff -Naur nova.orig/nova/utils.py nova/nova/utils.py
---- nova.orig/nova/utils.py	2012-02-22 20:57:08.060044569 -0500
-+++ nova/nova/utils.py	2012-02-22 20:58:15.364044601 -0500
+ 
+ 
+ class TestLockCleanup(test.TestCase):
+Index: nova/nova/utils.py
+===================================================================
+--- nova.orig/nova/utils.py	2012-02-24 19:29:28.000000000 -0800
++++ nova/nova/utils.py	2012-02-24 19:30:40.819750120 -0800
 @@ -32,6 +32,7 @@
  import re
  import shlex
@@ -159,7 +167,7 @@
  import struct
  import sys
  import time
-@@ -53,6 +54,7 @@
+@@ -54,6 +55,7 @@
  from nova.openstack.common import cfg
  
  
@@ -167,7 +175,7 @@
  LOG = logging.getLogger(__name__)
  ISO_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
  PERFECT_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
-@@ -1434,3 +1436,132 @@
+@@ -1523,3 +1525,132 @@
          return out
      except exception.ProcessExecutionError:
          raise exception.FileNotFound(file_path=file_path)
@@ -300,9 +308,10 @@
 +
 +    def close(self):
 +        self.f.close()
-diff -Naur nova.orig/nova/virt/libvirt/connection.py nova/nova/virt/libvirt/connection.py
---- nova.orig/nova/virt/libvirt/connection.py	2012-02-22 20:57:08.064044569 -0500
-+++ nova/nova/virt/libvirt/connection.py	2012-02-22 20:58:15.368044601 -0500
+Index: nova/nova/virt/libvirt/connection.py
+===================================================================
+--- nova.orig/nova/virt/libvirt/connection.py	2012-02-24 19:29:28.000000000 -0800
++++ nova/nova/virt/libvirt/connection.py	2012-02-24 19:30:40.819750120 -0800
 @@ -39,15 +39,19 @@
  
  """
@@ -468,7 +477,7 @@
  
      @staticmethod
      def get_host_ip_addr():
-@@ -997,8 +1069,25 @@
+@@ -998,8 +1070,25 @@
              container_dir = '%s/rootfs' % basepath(suffix='')
              libvirt_utils.ensure_tree(container_dir)
  
@@ -496,10 +505,11 @@
  
          if not disk_images:
              disk_images = {'image_id': instance['image_ref'],
-diff -Naur nova.orig/nova/virt/libvirt.xml.template nova/nova/virt/libvirt.xml.template
---- nova.orig/nova/virt/libvirt.xml.template	2012-02-22 20:57:08.064044569 -0500
-+++ nova/nova/virt/libvirt.xml.template	2012-02-22 20:58:15.364044601 -0500
-@@ -152,8 +152,8 @@
+Index: nova/nova/virt/libvirt.xml.template
+===================================================================
+--- nova.orig/nova/virt/libvirt.xml.template	2012-02-24 19:29:28.000000000 -0800
++++ nova/nova/virt/libvirt.xml.template	2012-02-24 19:30:40.819750120 -0800
+@@ -160,8 +160,8 @@
  
  #end for
          <!-- The order is significant here.  File must be defined first -->