Merge lp:~zulcss/nova/2014.1.b1 into lp:~ubuntu-server-dev/nova/icehouse

[Chuck Short]

Nova 2014.1~b1

[James Page (james-page)]

Technically:

+Uptream: https://review.openstack.org/#/c/60052/

should be

+Forwarded: https://review.openstack.org/#/c/60052/

and

+ - Add OSLO_VERSION to get around python-pbr sillyness.

sounds a little judgemental

how about:

- Add OSLO_VERSION to set correct distro version for package build.

review: Needs Fixing

[lp:~zulcss/nova/2014.1.b1]

635. By Chuck Short on 2013-12-05

Fix up based on suggestions

[James Page (james-page)]

review: Approve

[lp:~zulcss/nova/2014.1.b1]

636. By Chuck Short on 2013-12-05

Fix typo

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-03 19:42:58 +0000
+++ debian/changelog	2013-12-05 16:35:37 +0000
@@ -1,4 +1,4 @@
-nova (1:2013.2-0ubuntu1) UNRELEASED; urgency=low
+nova (1:2014.1~b1-0ubuntu1) trusty; urgency=low
 
   * New upstream release.
   * debian/control:
@@ -16,12 +16,15 @@
     - Remove git vcs, its not being used by anyone, complain if you are.
     - Removed libvirtd detection, no need for it so drop it.
     - Simplify building required docs including mangpages.
+    - Add OSLO_VERSION to set correct distro version for package build.
   * debian/patches/sqlachemy-0.8.3-compat.patch: Add support for
     sqlachemy 0.8.3.
   * debian/patches/avoid-failing-test.patch: Dropped.
   * debian/patches/skip_ipv6_test.patch: Skip ipv6 test.
+  * debian/patches/fix-libvirt-regression.patch: Fix libvirt regression
+    while running the tests.
 
- -- Chuck Short <[e-mail]>  Thu, 14 Nov 2013 08:51:55 -0500
+ -- Chuck Short <[e-mail]>  Thu, 05 Dec 2013 11:25:41 -0500
 
 nova (1:2013.2-0ubuntu1) saucy; urgency=low
 

=== added file 'debian/patches/fix-libvirt-regression.patch'
--- debian/patches/fix-libvirt-regression.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-libvirt-regression.patch	2013-12-05 16:35:37 +0000
@@ -0,0 +1,15 @@
+Description: Fix regression while running libvirt
+Author: Chuck Short <[e-mail]>
+Forwarded: https://review.openstack.org/#/c/60052/
+diff -Naurp nova-2014.1.b1.orig/nova/tests/virt/libvirt/fakelibvirt.py nova-2014.1.b1/nova/tests/virt/libvirt/fakelibvirt.py
+--- nova-2014.1.b1.orig/nova/tests/virt/libvirt/fakelibvirt.py	2013-12-05 09:21:50.000000000 -0500
++++ nova-2014.1.b1/nova/tests/virt/libvirt/fakelibvirt.py	2013-12-05 10:50:14.023727889 -0500
+@@ -511,7 +511,7 @@ class DomainSnapshot(object):
+ 
+ 
+ class Connection(object):
+-    def __init__(self, uri, readonly, version=9007):
++    def __init__(self, uri=None, readonly=None, version=9007):
+         if not uri or uri == '':
+             if allow_default_uri_connection:
+                 uri = 'qemu:///session'

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-03 19:42:58 +0000
+++ debian/patches/series	2013-12-05 16:35:37 +0000
@@ -4,3 +4,4 @@
 fix-novnc-regression.patch
 sqlachemy-0.8.3-compat.patch
 skip_ipv6_test.patch
+fix-libvirt-regression.patch

=== modified file 'debian/rules'
--- debian/rules	2013-12-05 14:42:50 +0000
+++ debian/rules	2013-12-05 16:35:37 +0000
@@ -3,6 +3,9 @@
 # Verbose mode
 #export DH_VERBOSE=1
 
+VERSION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([0-9]:)*([^-]+).*,\2,p')
+export OSLO_PACKAGE_VERSION=$(VERSION)
+
 # Send HTTP traffic to “discard” service
 export http_proxy = http://127.0.1.1:9/
 export https_proxy = ${http_proxy}