Merge lp:~zulcss/nova/nova-fixes into lp:~openstack-ubuntu-testing/nova/grizzly

[Chuck Short]

ftbfs

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-25 20:24:20 +0000
+++ debian/changelog	2013-01-30 15:04:22 +0000
@@ -15,6 +15,16 @@
 
  -- Adam Gandelman <[e-mail]>  Wed, 23 Jan 2013 14:23:22 -0800
 
+nova (2013.1~g2-0ubuntu3) raring; urgency=low
+
+  * SECURITY UPDATE: fix lack of authentication on block device used for
+    os-volume_boot
+    - debian/patches/CVE-2013-0208.patch: adjust nova/compute/api.py to
+      validate we can access the volumes
+    - CVE-2013-0208
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 24 Jan 2013 08:23:44 -060
+
 nova (2013.1~g2-0ubuntu2) raring; urgency=low
 
   * Make nova-compute-kvm prefer qemu-system over kvm for the new qemu.

=== modified file 'debian/patches/avoid_setuptools_git_dependency.patch'
--- debian/patches/avoid_setuptools_git_dependency.patch	2013-01-02 13:51:05 +0000
+++ debian/patches/avoid_setuptools_git_dependency.patch	2013-01-30 15:04:22 +0000
@@ -1,15 +1,6 @@
-Author: Adam Gandelman <[e-mail]>
-Date: Thu Oct 11 00:42:53 PDT 2012
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nova/+bug/1059907
-Subject: Avoid installation of python-setuptools-git.
-
-Remove setuptools_git from pip-requires so that it is not automatically
-added to the dependency list by dh_python2, and avoid having it and its
-dependencies (git!) installed with python-nova.
-
 diff -Naurp nova-2013.1.orig/setup.py nova-2013.1/setup.py
---- nova-2013.1.orig/setup.py	2013-01-01 23:04:36.000000000 -0600
-+++ nova-2013.1/setup.py	2013-01-02 07:50:05.081000609 -0600
+--- nova-2013.1.orig/setup.py	2013-01-30 06:15:44.000000000 -0600
++++ nova-2013.1/setup.py	2013-01-30 08:39:13.680907782 -0600
 @@ -43,7 +43,6 @@ setuptools.setup(name='nova',
        install_requires=requires,
        include_package_data=True,
@@ -19,13 +10,13 @@
                 'bin/nova-api',
                 'bin/nova-api-ec2',
 diff -Naurp nova-2013.1.orig/tools/pip-requires nova-2013.1/tools/pip-requires
---- nova-2013.1.orig/tools/pip-requires	2013-01-01 23:04:36.000000000 -0600
-+++ nova-2013.1/tools/pip-requires	2013-01-02 07:49:48.285000601 -0600
+--- nova-2013.1.orig/tools/pip-requires	2013-01-30 06:15:44.000000000 -0600
++++ nova-2013.1/tools/pip-requires	2013-01-30 08:39:26.836907788 -0600
 @@ -19,7 +19,6 @@ paramiko
  Babel>=0.9.6
  iso8601>=0.1.4
  httplib2
 -setuptools_git>=0.4
- python-cinderclient
+ python-cinderclient>=1.0.1
  python-quantumclient>=2.1
  python-glanceclient>=0.5.0,<2