Merge lp:~gandelman-a/nova/iso8601 into lp:~openstack-ubuntu-packagers/nova/ubuntu

[Adam Gandelman]

New dependency: python-iso8601

Unmerged revisions

313. By Adam Gandelman on 2012-02-20

debian/control: Add new dependency python-iso8601 to Build-Depends +
python-nova Depends

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-13 17:01:11 +0000
+++ debian/changelog	2012-02-20 10:08:22 +0000
@@ -1,4 +1,21 @@
-nova (2012.1~e4~20120211.12605-0ubuntu1) UNRELEASED; urgency=low
+nova (2012.1~e4~20120217.12709-0ubuntu2) UNRELEASED; urgency=low
+
+  [ Adam Gandelman ]
+  debian/control: Add new dependency python-iso8601 to Build-Depends +
+  python-nova Depends
+
+  [ Monty Taylor ]
+  * Move files from nova/locale to /usr/share/locale
+
+  [Chuck Short]
+  * debian/rules: Fix FTBFS.
+
+  [ Chuck Short ]
+  * Add depends on python-babel.
+
+ -- Chuck Short <[e-mail]>  Sun, 19 Feb 2012 13:48:42 -0500
+
+nova (2012.1~e4~20120217.12709-0ubuntu1) precise; urgency=low
 
   [ Dave Walker (Daviey) ]
   * New upstream snapshot
@@ -7,7 +24,16 @@
   * debian/patches/libvirt-use-console-pipe.patch:
     - Rebased against latest trunk
 
- -- Dave Walker (Daviey) <[e-mail]>  Sat, 11 Feb 2012 02:03:25 +0000
+  [ Chuck Short ]
+  * debian/nova.conf: Re-enable default iscsi_helper.
+  * debian/nova.conf: More fixups.
+  * debian/control: Dont depend and conflicts on nova-compute-
+    hypervisor. (LP: #923681)
+  * debian/patches/libvirt-us-console-pipe.patch: Refreshed.
+  * Temporarily disable console patch. (LP: #932787)
+  * New usptream version.
+
+ -- Chuck Short <[e-mail]> Fri, 17 Feb 2012 11:02:12 -0500
 
 nova (2012.1~e4~20120210.12574-0ubuntu1) precise; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2012-02-13 17:01:11 +0000
+++ debian/control	2012-02-20 10:08:22 +0000
@@ -42,6 +42,8 @@
  python-xattr,
  python-feedparser,
  python-crypto,
+ python-babel,
+ python-iso8601,
  pep8
 Build-Conflicts: python-cjson
 Standards-Version: 3.9.2
@@ -84,6 +86,7 @@
  python-xattr,
  python-daemon,
  python-suds,
+ python-iso8601,
  sudo,
  ${misc:Depends}
 Suggests: python-suds (>= 0.4.0),
@@ -156,8 +159,6 @@
 Architecture: all
 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, ${misc:Depends}
 Provides: nova-compute-hypervisor
-Replaces: nova-compute-hypervisor
-Conflicts: nova-compute-hypervisor
 Description: OpenStack Compute - compute node (LXC)
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -179,8 +180,6 @@
 Architecture: all
 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, user-mode-linux, ${misc:Depends}
 Provides: nova-compute-hypervisor
-Replaces: nova-compute-hypervisor
-Conflicts: nova-compute-hypervisor
 Description: OpenStack Compute - compute node (UserModeLinux)
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -203,8 +202,6 @@
 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, xen-hypervisor-4.1-amd64 | xen-hypervisor-4.1-i386,
   ${misc:Depends}
 Provides: nova-compute-hypervisor
-Replaces: nova-compute-hypervisor
-Conflicts: nova-compute-hypervisor
 Description: OpenStack Compute - compute node (Xen)
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -226,8 +223,6 @@
 Architecture: all
 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, qemu, ${misc:Depends}
 Provides: nova-compute-hypervisor
-Replaces: nova-compute-hypervisor
-Conflicts: nova-compute-hypervisor
 Description: OpenStack Compute - compute node (QEmu)
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -249,8 +244,6 @@
 Architecture: all
 Depends: nova-compute (= ${binary:Version}), python-libvirt, libvirt-bin, kvm, ${misc:Depends}
 Provides: nova-compute-hypervisor
-Replaces: nova-compute-hypervisor
-Conflicts: nova-compute-hypervisor
 Description: OpenStack Compute - compute node (KVM)
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
 
=== modified file 'debian/nova.conf'
--- debian/nova.conf	2012-01-25 14:33:10 +0000
+++ debian/nova.conf	2012-02-20 10:08:22 +0000
@@ -3,8 +3,8 @@
 --logdir=/var/log/nova
 --state_path=/var/lib/nova
 --lock_path=/var/lock/nova
---use_deprecated_auth
 --force_dhcp_release
+--iscsi_helper=tgtadm
 --libvirt_use_virtio_for_bridges
 --connection_type=libvirt
 --root_helper=sudo nova-rootwrap
 
=== modified file 'debian/patches/libvirt-use-console-pipe.patch'
--- debian/patches/libvirt-use-console-pipe.patch	2012-02-11 02:04:05 +0000
+++ debian/patches/libvirt-use-console-pipe.patch	2012-02-20 10:08:22 +0000
@@ -1,6 +1,7 @@
---- a/Authors
-+++ b/Authors
-@@ -136,6 +136,7 @@
+diff -Naurp nova.orig/Authors nova/Authors
+--- nova.orig/Authors	2012-02-14 12:09:51.913338628 -0500
++++ nova/Authors	2012-02-14 12:10:09.901337405 -0500
+@@ -138,6 +138,7 @@ Renuka Apte <[e-mail]>
  Ricardo Carrillo Cruz <[e-mail]>
  Rick Clark <[e-mail]>
  Rick Harris <[e-mail]>
@@ -8,9 +9,10 @@
  Rob Kost <[e-mail]>
  Russell Bryant <[e-mail]>
  Ryan Lane <[e-mail]>
---- a/nova/tests/test_libvirt.py
-+++ b/nova/tests/test_libvirt.py
-@@ -761,7 +761,7 @@
+diff -Naurp nova.orig/nova/tests/test_libvirt.py nova/nova/tests/test_libvirt.py
+--- nova.orig/nova/tests/test_libvirt.py	2012-02-14 12:09:51.997338631 -0500
++++ nova/nova/tests/test_libvirt.py	2012-02-14 12:10:09.905337571 -0500
+@@ -761,7 +761,7 @@ class LibvirtConnTestCase(test.TestCase)
              (lambda t: _ipv4_like(t.findall(parameter)[1].get('value'),
                                    '192.168.*.1'), True),
              (lambda t: t.find('./devices/serial/source').get(
@@ -19,7 +21,7 @@
              (lambda t: t.find('./memory').text, '2097152')]
          if rescue:
              common_checks += [
-@@ -1774,6 +1774,56 @@
+@@ -1774,6 +1774,56 @@ class NWFilterTestCase(test.TestCase):
          db.instance_destroy(admin_ctxt, instance_ref['id'])
  
  
@@ -76,8 +78,9 @@
  class LibvirtUtilsTestCase(test.TestCase):
      def test_get_iscsi_initiator(self):
          self.mox.StubOutWithMock(utils, 'execute')
---- a/nova/tests/test_utils.py
-+++ b/nova/tests/test_utils.py
+diff -Naurp nova.orig/nova/tests/test_utils.py nova/nova/tests/test_utils.py
+--- nova.orig/nova/tests/test_utils.py	2012-02-14 12:09:51.997338631 -0500
++++ nova/nova/tests/test_utils.py	2012-02-14 12:10:09.905337571 -0500
 @@ -17,11 +17,14 @@
  import __builtin__
  import mox
@@ -93,7 +96,7 @@
  import nova
  from nova import exception
  from nova import flags
-@@ -700,3 +703,56 @@
+@@ -700,3 +703,56 @@ class DeprecationTest(test.TestCase):
          h1 = utils.hash_file(flo)
          h2 = hashlib.sha1(data).hexdigest()
          self.assertEquals(h1, h2)
@@ -150,9 +153,10 @@
 +        f.close()
 +
 +
---- a/nova/utils.py
-+++ b/nova/utils.py
-@@ -27,11 +27,13 @@
+diff -Naurp nova.orig/nova/utils.py nova/nova/utils.py
+--- nova.orig/nova/utils.py	2012-02-14 12:09:52.001338633 -0500
++++ nova/nova/utils.py	2012-02-14 12:10:09.905337571 -0500
+@@ -27,11 +27,13 @@ import inspect
  import json
  import lockfile
  import os
@@ -166,7 +170,7 @@
  import struct
  import sys
  import time
-@@ -52,6 +54,7 @@
+@@ -52,6 +54,7 @@ from nova import log as logging
  from nova.openstack.common import cfg
  
  
@@ -174,7 +178,7 @@
  LOG = logging.getLogger("nova.utils")
  ISO_TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
  PERFECT_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
-@@ -1420,3 +1423,133 @@
+@@ -1420,3 +1423,133 @@ def read_file_as_root(file_path):
          return out
      except exception.ProcessExecutionError:
          raise exception.FileNotFound(file_path=file_path)
@@ -308,9 +312,10 @@
 +    def close(self):
 +        self.f.close()
 +
---- a/nova/virt/libvirt/connection.py
-+++ b/nova/virt/libvirt/connection.py
-@@ -39,15 +39,19 @@
+diff -Naurp nova.orig/nova/virt/libvirt/connection.py nova/nova/virt/libvirt/connection.py
+--- nova.orig/nova/virt/libvirt/connection.py	2012-02-14 12:09:52.001338633 -0500
++++ nova/nova/virt/libvirt/connection.py	2012-02-14 12:11:04.853340374 -0500
+@@ -39,15 +39,19 @@ Supports KVM, LXC, QEMU, UML, and XEN.
  
  """
  
@@ -330,7 +335,7 @@
  from eventlet import greenthread
  from xml.dom import minidom
  from xml.etree import ElementTree
-@@ -141,6 +145,9 @@
+@@ -138,6 +142,9 @@ libvirt_opts = [
      cfg.BoolOpt('libvirt_use_virtio_for_bridges',
                  default=False,
                  help='Use virtio for bridge interfaces'),
@@ -340,7 +345,7 @@
      cfg.StrOpt('libvirt_disk_prefix',
                 default=None,
                 help='Override the default disk prefix for the devices attached'
-@@ -179,6 +186,57 @@
+@@ -176,6 +183,57 @@ def _get_eph_disk(ephemeral):
      return 'disk.eph' + str(ephemeral['num'])
  
  
@@ -398,7 +403,7 @@
  class LibvirtConnection(driver.ComputeDriver):
  
      def __init__(self, read_only):
-@@ -212,6 +270,8 @@
+@@ -209,6 +267,8 @@ class LibvirtConnection(driver.ComputeDr
  
          self.image_cache_manager = imagecache.ImageCacheManager()
  
@@ -407,7 +412,7 @@
      @property
      def host_state(self):
          if not self._host_state:
-@@ -220,7 +280,11 @@
+@@ -217,7 +277,11 @@ class LibvirtConnection(driver.ComputeDr
  
      def init_host(self, host):
          # NOTE(nsokolov): moved instance restarting to ComputeManager
@@ -420,7 +425,7 @@
  
      @property
      def libvirt_xml(self):
-@@ -281,6 +345,15 @@
+@@ -278,6 +342,15 @@ class LibvirtConnection(driver.ComputeDr
          else:
              return libvirt.openAuth(uri, auth, 0)
  
@@ -436,15 +441,15 @@
      def instance_exists(self, instance_id):
          """Efficient override of base instance_exists method."""
          try:
-@@ -424,6 +497,7 @@
+@@ -419,6 +492,7 @@ class LibvirtConnection(driver.ComputeDr
      def _cleanup(self, instance):
          target = os.path.join(FLAGS.instances_path, instance['name'])
          instance_name = instance['name']
-+        self._stop_console_logger(instance_name)
-         LOG.info(_('instance %(instance_name)s: deleting instance files'
-                 ' %(target)s') % locals())
++        self._stop_console_loger(instance_name)
+         LOG.info(_('Deleting instance files %(target)s') % locals(),
+                  instance=instance)
          if FLAGS.libvirt_type == 'lxc':
-@@ -780,10 +854,10 @@
+@@ -776,10 +850,10 @@ class LibvirtConnection(driver.ComputeDr
  
      @exception.wrap_exception()
      def get_console_output(self, instance):
@@ -458,7 +463,7 @@
  
          if FLAGS.libvirt_type == 'xen':
              # Xen is special
-@@ -791,14 +865,14 @@
+@@ -787,12 +861,12 @@ class LibvirtConnection(driver.ComputeDr
                                           'ttyconsole',
                                           instance['name'])
              data = self._flush_xen_console(virsh_output)
@@ -466,17 +471,14 @@
 +            fpath = self._append_to_file(data, console_fifo)
          elif FLAGS.libvirt_type == 'lxc':
              # LXC is also special
-             LOG.info(_("Unable to read LXC console"))
+             LOG.info(_("Unable to read LXC console"), instance=instance)
          else:
 -            fpath = console_log
 +            fpath = console_fifo
  
--        return libvirt_utils.load_file(fpath)
-+        return self.console_loggers[instance['name']].peek()
+         return libvirt_utils.load_file(fpath)
  
-     @staticmethod
-     def get_host_ip_addr():
-@@ -934,7 +1008,24 @@
+@@ -930,7 +1004,24 @@ class LibvirtConnection(driver.ComputeDr
              libvirt_utils.ensure_tree(container_dir)
  
          # NOTE(vish): No need add the suffix to console.log
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-13 17:01:11 +0000
+++ debian/patches/series	2012-02-20 10:08:22 +0000
@@ -1,3 +1,3 @@
 nova-manage_flagfile_location.patch
 kombu_tests_timeout.patch
-libvirt-use-console-pipe.patch
+#libvirt-use-console-pipe.patch
 
=== modified file 'debian/rules'
--- debian/rules	2012-02-13 17:01:11 +0000
+++ debian/rules	2012-02-20 10:08:22 +0000
@@ -3,6 +3,12 @@
 # Verbose mode
 #export DH_VERBOSE=1
 
+include /usr/share/python/python.mk
+
+PACKAGE_NAME=python-nova
+debroot = debian/tmp
+site_packages_dir=$(debroot)$(call py_libdir,$(shell pyversions -d))
+
 # Lucid does not have dh_python2, but we would like to be able to use this
 # rules file to build on lucid as well. Thus the branching logic.
 WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
@@ -52,9 +58,15 @@
 			--prefix=$(DEBIAN_NAME)-$(DEBIAN_VERSION)/
 
 
-override_dh_install:
-	dh_install
-	chmod 440 $(CURDIR)/debian/nova-common/etc/sudoers.d/nova_sudoers
+override_dh_auto_install:
+	# python-nova
+	python setup.py install -f --install-layout=deb --root=$(debroot)
+	mkdir -p $(debroot)/usr/share
+	mv $(site_packages_dir)/nova/locale $(debroot)/usr/share
+	mkdir -p $(debroot)/usr/share/apport/package-hooks
+
+	# nova-common
+	install -D -m 440 $(CURDIR)/debian/nova_sudoers $(CURDIR)/debian/nova-common/etc/sudoers.d/nova_sudoers
 	install -D -m 0664 $(CURDIR)/debian/nova-volume.default	$(CURDIR)/debian/nova-volume/etc/default/nova-volume
 	for hypervisor in qemu kvm xen uml lxc; do \
 		install -D -m 0600 $(CURDIR)/debian/nova-compute-$${hypervisor}.conf $(CURDIR)/debian/nova-compute-$${hypervisor}/etc/nova/nova-compute.conf; \