[openstack-nova] Move recent patches into git (no functional changes)
Mark McLoughlin
markmc at fedoraproject.org
Fri Jan 6 13:46:37 UTC 2012
commit cf33e03c57cdee3e9dae6f7a3b391f4d7ca9923f
Author: Mark McLoughlin <markmc at redhat.com>
Date: Fri Jan 6 12:45:17 2012 +0000
Move recent patches into git (no functional changes)
0001-Add-tools-rfc.sh-from-master.patch | 4 +-
0002-Don-t-use-GitPython-for-authors-check.patch | 4 +-
...Made-jenkins-email-pruning-more-resilient.patch | 4 +-
0004-Removing-old-code-that-snuck-back-in.patch | 4 +-
...outstanding-pep8-errors-for-a-clean-trunk.patch | 4 +-
0006-Point-tools-rfc.sh-at-the-right-branch.patch | 4 +-
...kes-sure-to-recreate-gateway-for-moved-ip.patch | 4 +-
...y-qualified-domain-name-in-local-hostname.patch | 4 +-
...e-grantee-group-loading-for-source-groups.patch | 4 +-
...ders-when-auth_token-is-None.-Fixes-bug-8.patch | 4 +-
...pool-complexities-from-nova.db.sqlalchemy.patch | 4 +-
0012-Raise-InsufficientFreeMemory.patch | 4 +-
...g-author.patch => 0013-Add-missing-author.patch | 4 +-
...=> 0014-Make-snapshots-private-by-default.patch | 4 +-
...ackups-can-no-longer-happen-simultaneousl.patch | 4 +-
...lp850602.patch => 0016-Fixed-bug-lp850602.patch | 4 +-
0019-bug-861310.patch => 0017-bug-861310.patch | 4 +-
...up.patch => 0018-Enforce-snapshot-cleanup.patch | 4 +-
0021-bug-lp845714.patch => 0019-bug-lp845714.patch | 4 +-
...-version-specifier-to-kombu-in-pip-requir.patch | 4 +-
...nant-id-to-the-create-images-response-Loc.patch | 4 +-
...-bug-862633-OS-api-consoles-create-broken.patch | 4 +-
...atch => 0023-Deallocate-ip-if-build-fails.patch | 4 +-
...p-returning-correct-password-on-api-calls.patch | 4 +-
...0025-Handle-pidfile-exception-for-dnsmasq.patch | 4 +-
...6-Make-sure-unknown-extensions-return-404.patch | 4 +-
...ginal-exception-in-ClassNotFound-exceptio.patch | 4 +-
...default-FLAGS.logfile_mode-is-properly-co.patch | 4 +-
...> 0029-Don-t-leak-exceptions-out-to-users.patch | 6 +-
...snapshots-work-for-amis.-Fixes-bug-873156.patch | 10 +-
...t-errors-on-confirm-revertResize-failures.patch | 6 +-
...ds-ext4-and-reiserfs-to-_mount_filesystem.patch | 6 +-
0033-Improve-access-check-on-images.patch | 6 +-
...es-bug-834633-Auto-assigning-floating-IPs.patch | 6 +-
0035-fixes-bug-883233.patch | 8 +-
...Sanitize-EC2-manifests-and-image-tarballs.patch | 6 +-
...hain-rule-for-EC2-metadata-requests-lp-85.patch | 6 +-
...pi-add-the-INPUT-rule-for-EC2-metadata-lp.patch | 6 +-
...ser-to-choose-either-ietadm-or-tgtadm-lp-.patch | 6 +-
...e-VolumeDriver.sync_exec-method-lp-819997.patch | 6 +-
...tadm-tgtadm-calls-out-into-helper-classes.patch | 6 +-
...57-abstract-out-disk-image-access-methods.patch | 20 +++---
...7-support-handling-images-with-libguestfs.patch | 6 +-
...e-don-t-access-the-net-when-building-docs.patch | 28 +++++++
openstack-nova-nonet.patch | 11 ---
openstack-nova.spec | 79 ++++++++++----------
46 files changed, 180 insertions(+), 160 deletions(-)
---
diff --git a/0001-Add-tools-rfc.sh-from-master.patch b/0001-Add-tools-rfc.sh-from-master.patch
index 073d276..300088b 100644
--- a/0001-Add-tools-rfc.sh-from-master.patch
+++ b/0001-Add-tools-rfc.sh-from-master.patch
@@ -1,7 +1,7 @@
From 3a63bd53aa0e37c1ba5520b4031b2d1293592263 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Wed, 12 Oct 2011 13:46:02 +0100
-Subject: [PATCH 01/40] Add tools/rfc.sh from master
+Subject: [PATCH 01/44] Add tools/rfc.sh from master
We'll be managing the diablo branch using gerrit, so we'll need this
script.
@@ -171,5 +171,5 @@ index 0000000..0c578f1
+
+main "$@"
--
-1.7.6.4
+1.7.6.5
diff --git a/0002-Don-t-use-GitPython-for-authors-check.patch b/0002-Don-t-use-GitPython-for-authors-check.patch
index c2c113c..ba2b423 100644
--- a/0002-Don-t-use-GitPython-for-authors-check.patch
+++ b/0002-Don-t-use-GitPython-for-authors-check.patch
@@ -1,7 +1,7 @@
From ba68a78d440269ac21f16cb19b4fd3ba8949c945 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 23 Sep 2011 15:57:55 +0100
-Subject: [PATCH 02/40] Don't use GitPython for authors check
+Subject: [PATCH 02/44] Don't use GitPython for authors check
I hit this issue with an older GitPython version:
@@ -77,5 +77,5 @@ index 66d6a48..232887c 100644
-GitPython
paramiko
--
-1.7.6.4
+1.7.6.5
diff --git a/0003-Made-jenkins-email-pruning-more-resilient.patch b/0003-Made-jenkins-email-pruning-more-resilient.patch
index 67b0277..7818a87 100644
--- a/0003-Made-jenkins-email-pruning-more-resilient.patch
+++ b/0003-Made-jenkins-email-pruning-more-resilient.patch
@@ -1,7 +1,7 @@
From 6503923b235590e363d366375f3d2747e4d516b1 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred at inaugust.com>
Date: Fri, 23 Sep 2011 17:37:29 -0400
-Subject: [PATCH 03/40] Made jenkins email pruning more resilient.
+Subject: [PATCH 03/44] Made jenkins email pruning more resilient.
(cherry picked from commit c586e4ed23846420177802c164f594e021cceea8)
@@ -24,5 +24,5 @@ index 45c4965..f30a1bf 100644
email = '<' + email + '>'
contributors.add(str_dict_replace(email, mailmap))
--
-1.7.6.4
+1.7.6.5
diff --git a/0004-Removing-old-code-that-snuck-back-in.patch b/0004-Removing-old-code-that-snuck-back-in.patch
index ae1b9e3..3b4cc1a 100644
--- a/0004-Removing-old-code-that-snuck-back-in.patch
+++ b/0004-Removing-old-code-that-snuck-back-in.patch
@@ -1,7 +1,7 @@
From b0e855e504d2c7b5f7b50f436e43a27ec05e5a46 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon at rackspace.com>
Date: Fri, 23 Sep 2011 10:35:18 -0400
-Subject: [PATCH 04/40] Removing old code that snuck back in
+Subject: [PATCH 04/44] Removing old code that snuck back in
(cherry picked from commit 7a95f73ad7b295ddd2313152973c6da2c78fac76)
@@ -73,5 +73,5 @@ index 052b6f3..0000000
-from nova.endpoint.rackspace.controllers.sharedipgroups import \
- SharedIpGroupsController
--
-1.7.6.4
+1.7.6.5
diff --git a/0005-Fix-outstanding-pep8-errors-for-a-clean-trunk.patch b/0005-Fix-outstanding-pep8-errors-for-a-clean-trunk.patch
index e32fd2c..6ab2024 100644
--- a/0005-Fix-outstanding-pep8-errors-for-a-clean-trunk.patch
+++ b/0005-Fix-outstanding-pep8-errors-for-a-clean-trunk.patch
@@ -1,7 +1,7 @@
From d6137fb2442ad1f0e675deeb33e5cc456574e7d6 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred at inaugust.com>
Date: Thu, 22 Sep 2011 18:22:42 -0400
-Subject: [PATCH 05/40] Fix outstanding pep8 errors for a clean trunk.
+Subject: [PATCH 05/44] Fix outstanding pep8 errors for a clean trunk.
Also, add an option to run_tests.sh to skip running pep8. We have a separate
job in Jenkins which runs pep8, so there's no need to spin our wheels on it
@@ -671,5 +671,5 @@ index c1fda4c..b2567fe 100755
if [ $coverage -eq 1 ]; then
--
-1.7.6.4
+1.7.6.5
diff --git a/0006-Point-tools-rfc.sh-at-the-right-branch.patch b/0006-Point-tools-rfc.sh-at-the-right-branch.patch
index 9228f58..524535b 100644
--- a/0006-Point-tools-rfc.sh-at-the-right-branch.patch
+++ b/0006-Point-tools-rfc.sh-at-the-right-branch.patch
@@ -1,7 +1,7 @@
From 2e8b1175e43cce67832e2c564598e6cf2efff2de Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Tue, 18 Oct 2011 21:33:07 +0100
-Subject: [PATCH 06/40] Point tools/rfc.sh at the right branch
+Subject: [PATCH 06/44] Point tools/rfc.sh at the right branch
Change-Id: I9c4ed40015ea658530206c3c0d0aad70605cd5fe
---
@@ -22,5 +22,5 @@ index 0c578f1..1afc13b 100755
set_hooks_commit_msg()
{
--
-1.7.6.4
+1.7.6.5
diff --git a/0007-Makes-sure-to-recreate-gateway-for-moved-ip.patch b/0007-Makes-sure-to-recreate-gateway-for-moved-ip.patch
index 36e6e31..826c224 100644
--- a/0007-Makes-sure-to-recreate-gateway-for-moved-ip.patch
+++ b/0007-Makes-sure-to-recreate-gateway-for-moved-ip.patch
@@ -1,7 +1,7 @@
From 1c8fedc82c4b388b0a3a876a54c7f14d3c2a8342 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda at gmail.com>
Date: Mon, 26 Sep 2011 05:14:39 -0700
-Subject: [PATCH 07/40] Makes sure to recreate gateway for moved ip
+Subject: [PATCH 07/44] Makes sure to recreate gateway for moved ip
If nova moves an ip when setting up dhcp, make sure to reset
the default gateway. Fixes bug 859587
@@ -116,5 +116,5 @@ index 940af7b..0e933ef 100755
'brd', '192.168.1.255', 'dev', 'eth0'),
('ip', '-f', 'inet6', 'addr', 'change',
--
-1.7.6.4
+1.7.6.5
diff --git a/0008-put-fully-qualified-domain-name-in-local-hostname.patch b/0008-put-fully-qualified-domain-name-in-local-hostname.patch
index 6932995..64d4d20 100644
--- a/0008-put-fully-qualified-domain-name-in-local-hostname.patch
+++ b/0008-put-fully-qualified-domain-name-in-local-hostname.patch
@@ -1,7 +1,7 @@
From 44a2a648e7c26e3721e5ee6e28a0104458bceba3 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser at ubuntu.com>
Date: Fri, 23 Sep 2011 16:44:44 -0400
-Subject: [PATCH 08/40] put fully qualified domain name in local-hostname
+Subject: [PATCH 08/44] put fully qualified domain name in local-hostname
make metadata service return fully qualified domain name (fqdn) in
the local-hostname field. (bug 854614)
@@ -99,5 +99,5 @@ index b06e5c1..f898609 100644
+ self.assertEqual(self.request('/meta-data/local-hostname'),
+ "%s.%s" % (self.instance['hostname'], FLAGS.dhcp_domain))
--
-1.7.6.4
+1.7.6.5
diff --git a/0009-Fix-the-grantee-group-loading-for-source-groups.patch b/0009-Fix-the-grantee-group-loading-for-source-groups.patch
index ccec3db..997ce76 100644
--- a/0009-Fix-the-grantee-group-loading-for-source-groups.patch
+++ b/0009-Fix-the-grantee-group-loading-for-source-groups.patch
@@ -1,7 +1,7 @@
From 1f6b213d92e71de1eb669e9fb869d564066dadf5 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda at gmail.com>
Date: Mon, 26 Sep 2011 08:34:14 -0700
-Subject: [PATCH 09/40] Fix the grantee group loading for source groups
+Subject: [PATCH 09/44] Fix the grantee group loading for source groups
Fixes bug 859679.
@@ -34,5 +34,5 @@ index 3226999..6cc678a 100644
return result
--
-1.7.6.4
+1.7.6.5
diff --git a/0010-Call-endheaders-when-auth_token-is-None.-Fixes-bug-8.patch b/0010-Call-endheaders-when-auth_token-is-None.-Fixes-bug-8.patch
index d1dceaa..3f777f7 100644
--- a/0010-Call-endheaders-when-auth_token-is-None.-Fixes-bug-8.patch
+++ b/0010-Call-endheaders-when-auth_token-is-None.-Fixes-bug-8.patch
@@ -1,7 +1,7 @@
From 2754749c3767b7ddd90957b528828e235e25ccab Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince at rackspace.com>
Date: Mon, 26 Sep 2011 13:39:14 -0400
-Subject: [PATCH 10/40] Call endheaders when auth_token is None. Fixes bug
+Subject: [PATCH 10/44] Call endheaders when auth_token is None. Fixes bug
856721.
(cherry picked from commit 14eb9c6ec9c82c9f56cde5279aebb1e5a8fac4f4)
@@ -25,5 +25,5 @@ index 1a9ac37..3f12c2e 100755
resp = conn.getresponse()
if resp.status != httplib.OK:
--
-1.7.6.4
+1.7.6.5
diff --git a/0011-Removed-db_pool-complexities-from-nova.db.sqlalchemy.patch b/0011-Removed-db_pool-complexities-from-nova.db.sqlalchemy.patch
index 03838bc..507c23f 100644
--- a/0011-Removed-db_pool-complexities-from-nova.db.sqlalchemy.patch
+++ b/0011-Removed-db_pool-complexities-from-nova.db.sqlalchemy.patch
@@ -1,7 +1,7 @@
From 1a5e3e0c4cc2a3bf55331d46f702b980af1fbf97 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar at rackspace.com>
Date: Mon, 26 Sep 2011 11:52:21 -0400
-Subject: [PATCH 11/40] Removed db_pool complexities from
+Subject: [PATCH 11/44] Removed db_pool complexities from
nova.db.sqlalchemy.session. Fixes bug 838581.
(cherry picked from commit f3dd56e916232e38e74d9e2f24ce9a738cac63cf)
@@ -91,5 +91,5 @@ index aa76def..0a87148 100644
'sqlite:///$state_path/$sqlite_db',
'connection string for sql database')
--
-1.7.6.4
+1.7.6.5
diff --git a/0012-Raise-InsufficientFreeMemory.patch b/0012-Raise-InsufficientFreeMemory.patch
index e6a8af9..fd3a6f3 100644
--- a/0012-Raise-InsufficientFreeMemory.patch
+++ b/0012-Raise-InsufficientFreeMemory.patch
@@ -1,7 +1,7 @@
From 410a8df435fb424105872dc0a39f68eed902fbf2 Mon Sep 17 00:00:00 2001
From: Aaron Lee <aaron.lee at rackspace.com>
Date: Mon, 26 Sep 2011 18:22:03 -0500
-Subject: [PATCH 12/40] Raise InsufficientFreeMemory
+Subject: [PATCH 12/44] Raise InsufficientFreeMemory
Kind of fixes bug 851374 & bug 858679
@@ -65,5 +65,5 @@ index b0833f1..f483758 100644
disk_image_type = VMHelper.determine_disk_image_type(instance, context)
kernel = None
--
-1.7.6.4
+1.7.6.5
diff --git a/0015-Add-missing-author.patch b/0013-Add-missing-author.patch
similarity index 92%
rename from 0015-Add-missing-author.patch
rename to 0013-Add-missing-author.patch
index e4d3600..1878332 100644
--- a/0015-Add-missing-author.patch
+++ b/0013-Add-missing-author.patch
@@ -1,7 +1,7 @@
From 26434ef46761b6e1303f394c32031057b7fec4fd Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Tue, 25 Oct 2011 06:19:27 +0100
-Subject: [PATCH 15/40] Add missing author
+Subject: [PATCH 13/44] Add missing author
Add Aaron Lee to Authors for the previous patch which somehow got
past Jenkins.
@@ -21,5 +21,5 @@ index 8d6837e..f3962c8 100644
Adam Johnson <adjohn at gmail.com>
Alex Meade <alex.meade at rackspace.com>
--
-1.7.6.4
+1.7.6.5
diff --git a/0016-Make-snapshots-private-by-default.patch b/0014-Make-snapshots-private-by-default.patch
similarity index 94%
rename from 0016-Make-snapshots-private-by-default.patch
rename to 0014-Make-snapshots-private-by-default.patch
index f4bd133..abcd05e 100644
--- a/0016-Make-snapshots-private-by-default.patch
+++ b/0014-Make-snapshots-private-by-default.patch
@@ -1,7 +1,7 @@
From 5d4b9111caa80258d1aff4b68d9524915d711838 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt at rackspace.com>
Date: Wed, 28 Sep 2011 02:53:58 +0000
-Subject: [PATCH 16/40] Make snapshots private by default
+Subject: [PATCH 14/44] Make snapshots private by default
Fixes bug 850389
@@ -26,5 +26,5 @@ index 3f12c2e..4302c84 100755
'x-image-meta-disk-format': 'vhd',
'x-image-meta-container-format': 'ovf',
--
-1.7.6.4
+1.7.6.5
diff --git a/0017-Snapshots-backups-can-no-longer-happen-simultaneousl.patch b/0015-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
similarity index 99%
rename from 0017-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
rename to 0015-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
index 0ab2c62..db1e3b3 100644
--- a/0017-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
+++ b/0015-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
@@ -1,7 +1,7 @@
From 852b9307ac86b20cbe870aa5bbfaf121226f5440 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar at rackspace.com>
Date: Mon, 26 Sep 2011 23:41:28 -0400
-Subject: [PATCH 17/40] Snapshots/backups can no longer happen simultaneously.
+Subject: [PATCH 15/44] Snapshots/backups can no longer happen simultaneously.
Tests included.
Implemented exception.InstanceBusy when attempting to snapshot/backup an
@@ -192,5 +192,5 @@ index 050d139..67dbe5e 100644
"""Make sure we can get console output from instance"""
instance_id = self._create_instance()
--
-1.7.6.4
+1.7.6.5
diff --git a/0018-Fixed-bug-lp850602.patch b/0016-Fixed-bug-lp850602.patch
similarity index 98%
rename from 0018-Fixed-bug-lp850602.patch
rename to 0016-Fixed-bug-lp850602.patch
index b528eef..b1d5d7f 100644
--- a/0018-Fixed-bug-lp850602.patch
+++ b/0016-Fixed-bug-lp850602.patch
@@ -1,7 +1,7 @@
From 744a0d8e7aa2c16fe55098c96cf9e46984838a4f Mon Sep 17 00:00:00 2001
From: Kei Masumoto <masumotok at nttdata.co.jp>
Date: Wed, 28 Sep 2011 15:05:54 -0400
-Subject: [PATCH 18/40] Fixed bug lp850602. Adding backing file copy operation
+Subject: [PATCH 16/44] Fixed bug lp850602. Adding backing file copy operation
on kvm block migration.
(cherry picked from commit b9aac1181581b9036c98f5aa493731fdc74be7e1)
@@ -115,5 +115,5 @@ index 9290c5e..00be545 100644
return utils.dumps(disk_info)
--
-1.7.6.4
+1.7.6.5
diff --git a/0019-bug-861310.patch b/0017-bug-861310.patch
similarity index 96%
rename from 0019-bug-861310.patch
rename to 0017-bug-861310.patch
index 7853a12..9bde52b 100644
--- a/0019-bug-861310.patch
+++ b/0017-bug-861310.patch
@@ -1,7 +1,7 @@
From 1def4abeeb6e03ad82906aaa6975c753d1649747 Mon Sep 17 00:00:00 2001
From: Sateesh Chodapuneedi <sateesh.chodapuneedi at citrix.com>
Date: Wed, 28 Sep 2011 18:07:22 +0530
-Subject: [PATCH 19/40] bug 861310
+Subject: [PATCH 17/44] bug 861310
Check if host list is not empty before trying to weigh the hosts.
@@ -27,5 +27,5 @@ index e9c078b..a9ec556 100644
hosts = [dict(weight=1, hostname=hostname, capabilities=capabilities)
for hostname, capabilities in hosts]
--
-1.7.6.4
+1.7.6.5
diff --git a/0020-Enforce-snapshot-cleanup.patch b/0018-Enforce-snapshot-cleanup.patch
similarity index 98%
rename from 0020-Enforce-snapshot-cleanup.patch
rename to 0018-Enforce-snapshot-cleanup.patch
index 49f0e67..d8cbfad 100644
--- a/0020-Enforce-snapshot-cleanup.patch
+++ b/0018-Enforce-snapshot-cleanup.patch
@@ -1,7 +1,7 @@
From 5ff8e1cfa1b0ea22d7113b6d9fa729c8f43f1a19 Mon Sep 17 00:00:00 2001
From: David Subiros <david.perez5 at hp.com>
Date: Wed, 28 Sep 2011 15:19:04 +0100
-Subject: [PATCH 20/40] Enforce snapshot cleanup.
+Subject: [PATCH 18/44] Enforce snapshot cleanup.
Makes sure that the snapshot and the temporary directory is cleaned up,
even if qemu-img fails. Fixes bug 861582.
@@ -86,5 +86,5 @@ index 00be545..da00df0 100644
@exception.wrap_exception()
def reboot(self, instance, network_info, xml=None):
--
-1.7.6.4
+1.7.6.5
diff --git a/0021-bug-lp845714.patch b/0019-bug-lp845714.patch
similarity index 98%
rename from 0021-bug-lp845714.patch
rename to 0019-bug-lp845714.patch
index 0efd7f6..59084fc 100644
--- a/0021-bug-lp845714.patch
+++ b/0019-bug-lp845714.patch
@@ -1,7 +1,7 @@
From 45b48835d8edb4c6caa597eb05c959b394434f92 Mon Sep 17 00:00:00 2001
From: Aaron Lee <aaron.lee at rackspace.com>
Date: Thu, 22 Sep 2011 17:07:27 -0500
-Subject: [PATCH 21/40] bug lp845714
+Subject: [PATCH 19/44] bug lp845714
Kind of fixes it, this calls resize on the instance. The space will be
available, but the partition won't be resized to use this space.
@@ -96,5 +96,5 @@ index f483758..446b623 100644
def spawn(self, context, instance, network_info):
--
-1.7.6.4
+1.7.6.5
diff --git a/0022-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch b/0020-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch
similarity index 90%
rename from 0022-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch
rename to 0020-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch
index f32e65e..57c0c2e 100644
--- a/0022-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch
+++ b/0020-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch
@@ -1,7 +1,7 @@
From 74ce079c65b4283de58d46cf63943db2860a06fe Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar at rackspace.com>
Date: Thu, 29 Sep 2011 15:55:42 -0400
-Subject: [PATCH 22/40] Added ==1.0.4 version specifier to kombu in
+Subject: [PATCH 20/44] Added ==1.0.4 version specifier to kombu in
pip-requires to ensure tests pass in a clean venv.
Fixes bug 862629.
@@ -27,5 +27,5 @@ index 232887c..26c639b 100644
lxml==2.3
python-novaclient==2.6.0
--
-1.7.6.4
+1.7.6.5
diff --git a/0023-Adds-the-tenant-id-to-the-create-images-response-Loc.patch b/0021-Adds-the-tenant-id-to-the-create-images-response-Loc.patch
similarity index 97%
rename from 0023-Adds-the-tenant-id-to-the-create-images-response-Loc.patch
rename to 0021-Adds-the-tenant-id-to-the-create-images-response-Loc.patch
index f4f9531..0b37217 100644
--- a/0023-Adds-the-tenant-id-to-the-create-images-response-Loc.patch
+++ b/0021-Adds-the-tenant-id-to-the-create-images-response-Loc.patch
@@ -1,7 +1,7 @@
From 6f96fa65aa73e7803c9ba82d7a4f3b49b310e1b7 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade at rackspace.com>
Date: Thu, 29 Sep 2011 15:58:43 -0400
-Subject: [PATCH 23/40] Adds the tenant id to the create images response
+Subject: [PATCH 21/44] Adds the tenant id to the create images response
Location header Fixes bug 862672
(cherry picked from commit f3fb16a7935e91f8c9034d1da84a2b17cbe186f8)
@@ -51,5 +51,5 @@ index b9ef414..6a0feda 100644
def test_create_image_with_too_much_metadata(self):
body = {
--
-1.7.6.4
+1.7.6.5
diff --git a/0024-Fixes-bug-862633-OS-api-consoles-create-broken.patch b/0022-Fixes-bug-862633-OS-api-consoles-create-broken.patch
similarity index 99%
rename from 0024-Fixes-bug-862633-OS-api-consoles-create-broken.patch
rename to 0022-Fixes-bug-862633-OS-api-consoles-create-broken.patch
index 71c8694..262525e 100644
--- a/0024-Fixes-bug-862633-OS-api-consoles-create-broken.patch
+++ b/0022-Fixes-bug-862633-OS-api-consoles-create-broken.patch
@@ -1,7 +1,7 @@
From b797f1ddffe331d6663f6f53f8a823442c8c3650 Mon Sep 17 00:00:00 2001
From: Chris Behrens <cbehrens at codestud.com>
Date: Thu, 29 Sep 2011 20:54:19 +0000
-Subject: [PATCH 24/40] Fixes bug 862633 -- OS api consoles create() broken
+Subject: [PATCH 22/44] Fixes bug 862633 -- OS api consoles create() broken
Fixed and added tests for OS API consoles.py which didn't exist.
@@ -266,5 +266,5 @@ index 0000000..28c04d0
+ res = req.get_response(fakes.wsgi_app())
+ self.assertEqual(res.status_int, 404)
--
-1.7.6.4
+1.7.6.5
diff --git a/0025-Deallocate-ip-if-build-fails.patch b/0023-Deallocate-ip-if-build-fails.patch
similarity index 99%
rename from 0025-Deallocate-ip-if-build-fails.patch
rename to 0023-Deallocate-ip-if-build-fails.patch
index 7218f78..ca41168 100644
--- a/0025-Deallocate-ip-if-build-fails.patch
+++ b/0023-Deallocate-ip-if-build-fails.patch
@@ -1,7 +1,7 @@
From 87823bbc4940e585e9b2fa2d83d1a89d43c29275 Mon Sep 17 00:00:00 2001
From: Rick Harris <rconradharris at gmail.com>
Date: Tue, 27 Sep 2011 21:05:31 +0000
-Subject: [PATCH 25/40] Deallocate ip if build fails.
+Subject: [PATCH 23/44] Deallocate ip if build fails.
Fixes LP837687
@@ -155,5 +155,5 @@ index b2567fe..9a69195 100755
}
--
-1.7.6.4
+1.7.6.5
diff --git a/0026-Stop-returning-correct-password-on-api-calls.patch b/0024-Stop-returning-correct-password-on-api-calls.patch
similarity index 97%
rename from 0026-Stop-returning-correct-password-on-api-calls.patch
rename to 0024-Stop-returning-correct-password-on-api-calls.patch
index 8ea043e..8ac9b12 100644
--- a/0026-Stop-returning-correct-password-on-api-calls.patch
+++ b/0024-Stop-returning-correct-password-on-api-calls.patch
@@ -1,7 +1,7 @@
From b1ab6da1495784ff581000018a6047fd19cf82c4 Mon Sep 17 00:00:00 2001
From: Ahmad Hassan <ahmad.hassan at hp.com>
Date: Mon, 1 Aug 2011 17:16:49 +0100
-Subject: [PATCH 26/40] Stop returning correct password on api calls
+Subject: [PATCH 24/44] Stop returning correct password on api calls
Captured invalid signature exception in authentication step, so that
the problem is not returning exception to user, revealing the real
@@ -72,5 +72,5 @@ index 44e6e11..e050446 100644
class AuthManager(object):
--
-1.7.6.4
+1.7.6.5
diff --git a/0027-Handle-pidfile-exception-for-dnsmasq.patch b/0025-Handle-pidfile-exception-for-dnsmasq.patch
similarity index 95%
rename from 0027-Handle-pidfile-exception-for-dnsmasq.patch
rename to 0025-Handle-pidfile-exception-for-dnsmasq.patch
index 29d0ff4..f1b0663 100644
--- a/0027-Handle-pidfile-exception-for-dnsmasq.patch
+++ b/0025-Handle-pidfile-exception-for-dnsmasq.patch
@@ -1,7 +1,7 @@
From ad4eef0a0b296652f8ce08d86a10dea8a40b005b Mon Sep 17 00:00:00 2001
From: Yun Shen <Yun.Shen at hp.com>
Date: Thu, 29 Sep 2011 12:09:37 +0100
-Subject: [PATCH 27/40] Handle pidfile exception for dnsmasq
+Subject: [PATCH 25/44] Handle pidfile exception for dnsmasq
Capture the exception in dnsmasq_pid_for method. If the pidfile cannot be read
for some reason, it should be treated as if it does not exist. This prevents
@@ -47,5 +47,5 @@ index 5370f37..c0be962 100755
def _ra_pid_for(dev):
--
-1.7.6.4
+1.7.6.5
diff --git a/0028-Make-sure-unknown-extensions-return-404.patch b/0026-Make-sure-unknown-extensions-return-404.patch
similarity index 96%
rename from 0028-Make-sure-unknown-extensions-return-404.patch
rename to 0026-Make-sure-unknown-extensions-return-404.patch
index 9b14d0e..db596f7 100644
--- a/0028-Make-sure-unknown-extensions-return-404.patch
+++ b/0026-Make-sure-unknown-extensions-return-404.patch
@@ -1,7 +1,7 @@
From 0ca35753f5f5a506162fde679ae7719d5d22f8e0 Mon Sep 17 00:00:00 2001
From: Ahmad Hassan <ahmad.hassan at hp.com>
Date: Wed, 5 Oct 2011 17:02:45 +0100
-Subject: [PATCH 28/40] Make sure unknown extensions return 404
+Subject: [PATCH 26/44] Make sure unknown extensions return 404
At the moment, if an extension doens't exist and we call a show method
with wrong id then the exception is not captured. There is a need to
@@ -54,5 +54,5 @@ index 44f4eb0..0e9f9fa 100644
app = openstack.APIRouterV11()
ext_midware = extensions.ExtensionMiddleware(app)
--
-1.7.6.4
+1.7.6.5
diff --git a/0029-Include-original-exception-in-ClassNotFound-exceptio.patch b/0027-Include-original-exception-in-ClassNotFound-exceptio.patch
similarity index 97%
rename from 0029-Include-original-exception-in-ClassNotFound-exceptio.patch
rename to 0027-Include-original-exception-in-ClassNotFound-exceptio.patch
index f3e611d..c858e91 100644
--- a/0029-Include-original-exception-in-ClassNotFound-exceptio.patch
+++ b/0027-Include-original-exception-in-ClassNotFound-exceptio.patch
@@ -1,7 +1,7 @@
From 21393e64b9524b89d373d2d303afce38919c96c2 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien.danjou at enovance.com>
Date: Thu, 6 Oct 2011 17:15:32 +0200
-Subject: [PATCH 29/40] Include original exception in ClassNotFound exception
+Subject: [PATCH 27/44] Include original exception in ClassNotFound exception
By doing this, we allow the error messages to be more useful. When an import
of a class fails because of a missing module dependency, it would have fail
@@ -89,5 +89,5 @@ index 81157a4..c64b11f 100644
def import_object(import_str):
--
-1.7.6.4
+1.7.6.5
diff --git a/0030-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch b/0028-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch
similarity index 96%
rename from 0030-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch
rename to 0028-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch
index f3db1ff..79a960e 100644
--- a/0030-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch
+++ b/0028-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch
@@ -1,7 +1,7 @@
From fdcfe762a52e30e09223f4128a5f4da530aefcf9 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg at canonical.com>
Date: Thu, 29 Sep 2011 21:06:06 -0700
-Subject: [PATCH 30/40] Ensure non-default FLAGS.logfile_mode is properly
+Subject: [PATCH 28/44] Ensure non-default FLAGS.logfile_mode is properly
converted to an octet.
Fixes bug 862969.
@@ -45,5 +45,5 @@ index eb0b602..1e04f75 100644
self.removeHandler(self.filelog)
self.addHandler(self.streamlog)
--
-1.7.6.4
+1.7.6.5
diff --git a/0013-Don-t-leak-exceptions-out-to-users.patch b/0029-Don-t-leak-exceptions-out-to-users.patch
similarity index 90%
rename from 0013-Don-t-leak-exceptions-out-to-users.patch
rename to 0029-Don-t-leak-exceptions-out-to-users.patch
index d720346..c0edafc 100644
--- a/0013-Don-t-leak-exceptions-out-to-users.patch
+++ b/0029-Don-t-leak-exceptions-out-to-users.patch
@@ -1,7 +1,7 @@
-From 03c9f40f1d7be54e62b129edf41a3c729049ce0c Mon Sep 17 00:00:00 2001
+From d8874e9667b693488e979b56a3996cdf037cfc2f Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt at rackspace.com>
Date: Tue, 18 Oct 2011 22:08:49 +0000
-Subject: [PATCH 13/40] Don't leak exceptions out to users
+Subject: [PATCH 29/44] Don't leak exceptions out to users
Fixed bug 874472
@@ -32,5 +32,5 @@ index 3b74fef..36da46b 100644
--
-1.7.6.4
+1.7.6.5
diff --git a/0014-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch b/0030-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch
similarity index 97%
rename from 0014-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch
rename to 0030-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch
index 790fa88..1c8fff6 100644
--- a/0014-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch
+++ b/0030-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch
@@ -1,7 +1,7 @@
-From d46f6e095b43fc00099d87f73b098a137830b167 Mon Sep 17 00:00:00 2001
+From 56cb277ae540b915ef6c8b267eb1c511d62c3990 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda at gmail.com>
Date: Fri, 14 Oct 2011 10:06:00 -0700
-Subject: [PATCH 14/40] Makes snapshots work for amis. Fixes bug 873156
+Subject: [PATCH 30/44] Makes snapshots work for amis. Fixes bug 873156
(cherry picked from commit b931d51ce47203ee6a4433dc7577e0779ab94710)
@@ -87,7 +87,7 @@ index 9680d6f..9eeefe0 100644
self.assertTrue(isinstance(image['updated_at'], datetime.datetime))
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
-index 8d28590..51e584d 100644
+index 0f01de8..0673af2 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -340,6 +340,47 @@ class LibvirtConnTestCase(test.TestCase):
@@ -139,7 +139,7 @@ index 8d28590..51e584d 100644
if not self.lazy_load_library_exists():
return
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
-index 9290c5e..4b45515 100644
+index da00df0..67f4434 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -420,10 +420,17 @@ class LibvirtConnection(driver.ComputeDriver):
@@ -162,5 +162,5 @@ index 9290c5e..4b45515 100644
if 'container_format' in base:
metadata['container_format'] = base['container_format']
--
-1.7.6.4
+1.7.6.5
diff --git a/0031-Explicit-errors-on-confirm-revertResize-failures.patch b/0031-Explicit-errors-on-confirm-revertResize-failures.patch
index 2057c35..2d475a6 100644
--- a/0031-Explicit-errors-on-confirm-revertResize-failures.patch
+++ b/0031-Explicit-errors-on-confirm-revertResize-failures.patch
@@ -1,7 +1,7 @@
-From ec2bfe91b7bf7424eb34ad371ec25eec62cd3d24 Mon Sep 17 00:00:00 2001
+From 1658fa965658f45975b9257c2352d041611f47ea Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon at rackspace.com>
Date: Mon, 26 Sep 2011 13:57:34 -0400
-Subject: [PATCH 31/40] Explicit errors on confirm/revertResize failures
+Subject: [PATCH 31/44] Explicit errors on confirm/revertResize failures
Fixing bug 856527
@@ -84,5 +84,5 @@ index 6a0feda..eb4ec05 100644
"""The happy path for creating backups"""
self.flags(allow_admin_api=True)
--
-1.7.6.4
+1.7.6.5
diff --git a/0032-Adds-ext4-and-reiserfs-to-_mount_filesystem.patch b/0032-Adds-ext4-and-reiserfs-to-_mount_filesystem.patch
index 28b5216..11b8279 100644
--- a/0032-Adds-ext4-and-reiserfs-to-_mount_filesystem.patch
+++ b/0032-Adds-ext4-and-reiserfs-to-_mount_filesystem.patch
@@ -1,7 +1,7 @@
-From c206f73d03aa487868ba2acaa3581624160d1b67 Mon Sep 17 00:00:00 2001
+From f1836b116bfa21b0b6ddc5164c6a65f19a2eb2c5 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh at jk0.org>
Date: Thu, 20 Oct 2011 14:44:11 -0500
-Subject: [PATCH 32/40] Adds ext4 and reiserfs to _mount_filesystem().
+Subject: [PATCH 32/44] Adds ext4 and reiserfs to _mount_filesystem().
Fixes bug 870495.
@@ -26,5 +26,5 @@ index 302238c..2d82781 100644
except exception.ProcessExecutionError as e:
err = str(e)
--
-1.7.6.4
+1.7.6.5
diff --git a/0033-Improve-access-check-on-images.patch b/0033-Improve-access-check-on-images.patch
index 8770239..868d191 100644
--- a/0033-Improve-access-check-on-images.patch
+++ b/0033-Improve-access-check-on-images.patch
@@ -1,7 +1,7 @@
-From c11659215a1cd3e551ce56f089b2682842954b04 Mon Sep 17 00:00:00 2001
+From 978510d31d1b220181f81206204783ef19b84d8d Mon Sep 17 00:00:00 2001
From: Loganathan Parthipan <parthipan at hp.com>
Date: Thu, 29 Sep 2011 16:41:49 +0100
-Subject: [PATCH 33/40] Improve access check on images
+Subject: [PATCH 33/44] Improve access check on images
Makes sure that users can delete only their own images, snapshots.
Enable listing of all images, both private which are owned and the public
@@ -78,5 +78,5 @@ index 5361cfc..0198279 100644
return str(properties['project_id']) == str(context.project_id)
--
-1.7.6.4
+1.7.6.5
diff --git a/0034-Fixes-bug-834633-Auto-assigning-floating-IPs.patch b/0034-Fixes-bug-834633-Auto-assigning-floating-IPs.patch
index 6adea18..3ba63ff 100644
--- a/0034-Fixes-bug-834633-Auto-assigning-floating-IPs.patch
+++ b/0034-Fixes-bug-834633-Auto-assigning-floating-IPs.patch
@@ -1,7 +1,7 @@
-From 80d73a2df2c33212217c59783f62d74673776ebb Mon Sep 17 00:00:00 2001
+From 847ffd8028dd9941a7982109593240847af8b999 Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall at managedit.ie>
Date: Fri, 4 Nov 2011 19:43:50 +0000
-Subject: [PATCH 34/40] Fixes bug 834633 - Auto assigning floating IPs
+Subject: [PATCH 34/44] Fixes bug 834633 - Auto assigning floating IPs
Details:
@@ -58,5 +58,5 @@ index c582d4d..d8de396 100644
if floating_ip['auto_assigned']:
self.network_api.release_floating_ip(context,
--
-1.7.6.4
+1.7.6.5
diff --git a/0035-fixes-bug-883233.patch b/0035-fixes-bug-883233.patch
index fd76ff4..f85bd3b 100644
--- a/0035-fixes-bug-883233.patch
+++ b/0035-fixes-bug-883233.patch
@@ -1,7 +1,7 @@
-From 476c3259b1bb7cfe647aed4ac4a523d6fadff475 Mon Sep 17 00:00:00 2001
+From ef55728d41813a67d33552620b7cc3b52ea5895d Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo at cloudscaling.com>
Date: Wed, 2 Nov 2011 16:21:21 -0700
-Subject: [PATCH 35/40] fixes bug 883233.
+Subject: [PATCH 35/44] fixes bug 883233.
fix typo in scheduler/driver.py assert_compute_node_has_enough_memory.
@@ -14,7 +14,7 @@ Change-Id: Idce87927a35b5986c970e6293428b3a5fddd00e4
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Authors b/Authors
-index 2298120..e6ee68c 100644
+index cadfb26..cedd199 100644
--- a/Authors
+++ b/Authors
@@ -51,6 +51,7 @@ Jason Koelker <jason at koelker.net>
@@ -40,5 +40,5 @@ index 22f4e14..43e1382 100644
def assert_compute_node_has_enough_disk(self, context,
--
-1.7.6.4
+1.7.6.5
diff --git a/0041-Sanitize-EC2-manifests-and-image-tarballs.patch b/0036-Sanitize-EC2-manifests-and-image-tarballs.patch
similarity index 97%
rename from 0041-Sanitize-EC2-manifests-and-image-tarballs.patch
rename to 0036-Sanitize-EC2-manifests-and-image-tarballs.patch
index 3add583..65e8254 100644
--- a/0041-Sanitize-EC2-manifests-and-image-tarballs.patch
+++ b/0036-Sanitize-EC2-manifests-and-image-tarballs.patch
@@ -1,7 +1,7 @@
-From 76363226bd8533256f7795bba358d7f4b8a6c9e6 Mon Sep 17 00:00:00 2001
+From 2971b1846d27ab489a6604445836b043818d5425 Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry at openstack.org>
Date: Thu, 1 Dec 2011 17:54:16 +0100
-Subject: [PATCH] Sanitize EC2 manifests and image tarballs
+Subject: [PATCH 36/44] Sanitize EC2 manifests and image tarballs
Prevent potential directory traversal with malicious EC2 image tarballs,
by making sure the tarfile is safe before unpacking it. Fixes bug 894755
@@ -118,5 +118,5 @@ index f1ceeb7..4ab36a0 100644
+ self.image_service._test_for_malicious_tarball,
+ "/unused", os.path.join(os.path.dirname(__file__), 'rel.tar.gz'))
--
-1.7.6.4
+1.7.6.5
diff --git a/0036-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch b/0037-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
similarity index 91%
rename from 0036-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
rename to 0037-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
index fb0b12e..f7a1b87 100644
--- a/0036-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
+++ b/0037-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
@@ -1,7 +1,7 @@
-From b434509c19376d67e7cbf358661cbfdb2ea934f9 Mon Sep 17 00:00:00 2001
+From cf35b2a4900ef47c2f564d9eb6896434db711cdf Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Mon, 5 Sep 2011 07:10:52 +0100
-Subject: [PATCH 36/40] Add INPUT chain rule for EC2 metadata requests
+Subject: [PATCH 37/44] Add INPUT chain rule for EC2 metadata requests
(lp:856385)
On Fedora, the default policy for the INPUT chain in the filter table
@@ -37,5 +37,5 @@ index c0be962..fd51e9b 100755
--
-1.7.6.4
+1.7.6.5
diff --git a/0037-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch b/0038-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
similarity index 98%
rename from 0037-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
rename to 0038-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
index e357047..7c7afcc 100644
--- a/0037-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
+++ b/0038-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
@@ -1,7 +1,7 @@
-From 514d3518edd4d74623bf3a529683b2b59212e390 Mon Sep 17 00:00:00 2001
+From ff39bf6f78d2a2c0ea65b87ff0eec6f652eefc65 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 8 Sep 2011 14:29:49 +0100
-Subject: [PATCH 37/40] Have nova-api add the INPUT rule for EC2 metadata
+Subject: [PATCH 38/44] Have nova-api add the INPUT rule for EC2 metadata
(lp:856385)
It makes no sense to have nova-network add an iptables rule for the EC2
@@ -184,5 +184,5 @@ index 247eb4f..b9ad579 100644
self.port = self.server.port
--
-1.7.6.4
+1.7.6.5
diff --git a/0038-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch b/0039-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
similarity index 98%
rename from 0038-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
rename to 0039-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
index 892e9d7..5d364c0 100644
--- a/0038-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
+++ b/0039-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
@@ -1,7 +1,7 @@
-From 55e01ff6f84a201fecd1e550c8fad592a6edd567 Mon Sep 17 00:00:00 2001
+From 95e4d32d5abc9a86d7a6d1344f9c44ae293aca7b Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Thu, 11 Aug 2011 07:44:38 -0400
-Subject: [PATCH 38/40] Allow the user to choose either ietadm or tgtadm
+Subject: [PATCH 39/44] Allow the user to choose either ietadm or tgtadm
(lp:819997)
(Actually authored by Chuck Short <zulcss at ubuntu.com> but Gerrit won't
@@ -233,5 +233,5 @@ index e5bb498..76f0655 100644
# Instances remount read-only in this case.
# /etc/init.d/iscsitarget restart and rebooting nova-volume
--
-1.7.6.4
+1.7.6.5
diff --git a/0039-Remove-VolumeDriver.sync_exec-method-lp-819997.patch b/0040-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
similarity index 98%
rename from 0039-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
rename to 0040-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
index 8cd49b5..129c132 100644
--- a/0039-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
+++ b/0040-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
@@ -1,7 +1,7 @@
-From b82462cc4fd598cde59c663400e87824cb68a34b Mon Sep 17 00:00:00 2001
+From 01ffa1eedf3cdced97bc4e7e07175d6dab9bb0a9 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Sun, 18 Sep 2011 12:04:46 +0100
-Subject: [PATCH 39/40] Remove VolumeDriver.sync_exec method (lp:819997)
+Subject: [PATCH 40/44] Remove VolumeDriver.sync_exec method (lp:819997)
We always use the same functions for sync_exec and execute.
@@ -232,5 +232,5 @@ index 76f0655..8468602 100644
LOG.debug(_("Failed to retrieve QoS info"))
return {}
--
-1.7.6.4
+1.7.6.5
diff --git a/0040-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch b/0041-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
similarity index 99%
rename from 0040-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
rename to 0041-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
index 9e822f7..fc59c7f 100644
--- a/0040-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
+++ b/0041-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
@@ -1,7 +1,7 @@
-From fa75aca613a531a39e4a30a064e5d549ba26b7ac Mon Sep 17 00:00:00 2001
+From 4ee1b55f3c5e667e1a84a365f5ed759e3a284409 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Sun, 18 Sep 2011 16:02:43 +0100
-Subject: [PATCH 40/40] Refactor ietadm/tgtadm calls out into helper classes
+Subject: [PATCH 41/44] Refactor ietadm/tgtadm calls out into helper classes
(lp:819997)
Add a new TargetAdmin abstract base class and implement it using ietadm
@@ -557,5 +557,5 @@ index 0000000..d50dd5f
+ else:
+ return IetAdm()
--
-1.7.6.4
+1.7.6.5
diff --git a/0001-Bug-898257-abstract-out-disk-image-access-methods.patch b/0042-Bug-898257-abstract-out-disk-image-access-methods.patch
similarity index 98%
rename from 0001-Bug-898257-abstract-out-disk-image-access-methods.patch
rename to 0042-Bug-898257-abstract-out-disk-image-access-methods.patch
index a61ccf9..779417c 100644
--- a/0001-Bug-898257-abstract-out-disk-image-access-methods.patch
+++ b/0042-Bug-898257-abstract-out-disk-image-access-methods.patch
@@ -1,7 +1,7 @@
-From e63b54e824e5cf3585f9d9c87272941a75b6cea9 Mon Sep 17 00:00:00 2001
+From 6ae9df1eea3749ed2e570e1573b8a781f17caed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Wed, 30 Nov 2011 17:00:17 +0000
-Subject: [PATCH 1/2] Bug#898257 abstract out disk image access methods
+Subject: [PATCH 42/44] Bug#898257 abstract out disk image access methods
Rather than providing two mutually exlusive image
access methods (loop and qemu-nbd), try each in turn.
@@ -54,10 +54,10 @@ Change-Id: If3a4b1c8f4e2f2e7300a21071340dcc839cb36d7
create mode 100644 nova/virt/disk/nbd.py
diff --git a/nova/utils.py b/nova/utils.py
-index 4648f55..672d2ca 100644
+index c64b11f..f2e69cf 100644
--- a/nova/utils.py
+++ b/nova/utils.py
-@@ -202,6 +202,36 @@ def execute(*cmd, **kwargs):
+@@ -201,6 +201,36 @@ def execute(*cmd, **kwargs):
greenthread.sleep(0)
@@ -1021,7 +1021,7 @@ index 0000000..55b287e
+ self.linked = False
+ self.device = None
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
-index ba1dc86..bba2e0b 100644
+index 67f4434..19ad79e 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -179,6 +179,7 @@ class LibvirtConnection(driver.ComputeDriver):
@@ -1032,7 +1032,7 @@ index ba1dc86..bba2e0b 100644
self.read_only = read_only
fw_class = utils.import_class(FLAGS.firewall_driver)
-@@ -347,7 +348,7 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -336,7 +337,7 @@ class LibvirtConnection(driver.ComputeDriver):
LOG.info(_('instance %(instance_name)s: deleting instance files'
' %(target)s') % locals())
if FLAGS.libvirt_type == 'lxc':
@@ -1041,7 +1041,7 @@ index ba1dc86..bba2e0b 100644
if os.path.exists(target):
shutil.rmtree(target)
-@@ -1003,11 +1004,11 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -992,11 +993,11 @@ class LibvirtConnection(driver.ComputeDriver):
if config_drive: # Should be True or None by now.
injection_path = basepath('disk.config')
img_id = 'config-drive'
@@ -1055,7 +1055,7 @@ index ba1dc86..bba2e0b 100644
for injection in ('metadata', 'key', 'net'):
if locals()[injection]:
-@@ -1017,8 +1018,8 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -1006,8 +1007,8 @@ class LibvirtConnection(driver.ComputeDriver):
try:
disk.inject_data(injection_path, key, net, metadata,
partition=target_partition,
@@ -1066,7 +1066,7 @@ index ba1dc86..bba2e0b 100644
except Exception as e:
# This could be a windows image, or a vmdk format disk
-@@ -1026,9 +1027,9 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -1015,9 +1016,9 @@ class LibvirtConnection(driver.ComputeDriver):
' data into image %(img_id)s (%(e)s)') % locals())
if FLAGS.libvirt_type == 'lxc':
@@ -1079,5 +1079,5 @@ index ba1dc86..bba2e0b 100644
if FLAGS.libvirt_type == 'uml':
utils.execute('chown', 'root', basepath('disk'), run_as_root=True)
--
-1.7.6.4
+1.7.6.5
diff --git a/0002-Bug-898257-support-handling-images-with-libguestfs.patch b/0043-Bug-898257-support-handling-images-with-libguestfs.patch
similarity index 97%
rename from 0002-Bug-898257-support-handling-images-with-libguestfs.patch
rename to 0043-Bug-898257-support-handling-images-with-libguestfs.patch
index 1a1b012..8916944 100644
--- a/0002-Bug-898257-support-handling-images-with-libguestfs.patch
+++ b/0043-Bug-898257-support-handling-images-with-libguestfs.patch
@@ -1,7 +1,7 @@
-From 89e0437aff4bf039568e04f05f95b5142e392c04 Mon Sep 17 00:00:00 2001
+From c8850ec6c038291b0816aa64c67e754e59ec29e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Wed, 30 Nov 2011 17:00:17 +0000
-Subject: [PATCH 2/2] Bug#898257 support handling images with libguestfs
+Subject: [PATCH 43/44] Bug#898257 support handling images with libguestfs
http://libguestfs.org/ provides both utilities and libraries
to manipulate image files containing various operating systems.
@@ -154,5 +154,5 @@ index 0000000..6323dc8
+ utils.execute('fusermount', '-u', self.mount_dir, run_as_root=True)
+ self.mounted = False
--
-1.7.6.4
+1.7.6.5
diff --git a/0044-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0044-Ensure-we-don-t-access-the-net-when-building-docs.patch
new file mode 100644
index 0000000..8d09504
--- /dev/null
+++ b/0044-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -0,0 +1,28 @@
+From 31f7efd77ac07bebc7378b49dafa93c1219e2edf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
+Date: Fri, 6 Jan 2012 12:16:34 +0000
+Subject: [PATCH 44/44] Ensure we don't access the net when building docs
+
+(Note, this has not been sent upstream)
+
+Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2
+---
+ doc/source/conf.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 996dfb0..f62ebf8 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -25,7 +25,7 @@ sys.path.insert(0, os.path.abspath('./'))
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'ext.nova_todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig','sphinx.ext.graphviz']
++extensions = ['sphinx.ext.autodoc', 'ext.nova_todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig','sphinx.ext.graphviz']
+
+ # autodoc generation is a bit aggressive and a nuisance when doing heavy text edit cycles.
+ # execute "export SPHINX_DEBUG=1" in your terminal to disable
+--
+1.7.6.5
+
diff --git a/openstack-nova.spec b/openstack-nova.spec
index e82187a..ee32bbd 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
Name: openstack-nova
Version: 2011.3
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
@@ -30,10 +30,12 @@ Source23: openstack-nova-db-setup
#
# Patches managed here: https://github.com/markmc/nova/tree/fedora-patches
#
-# $> git format-patch b0e855e
+# $> git format-patch 2011.3
# $> for p in 00*.patch; do echo "Patch${p:2:2}: $p"; done
# $> for p in 00*.patch; do echo "%patch${p:2:2} -p1"; done
#
+
+# These are from stable/diablo
Patch01: 0001-Add-tools-rfc.sh-from-master.patch
Patch02: 0002-Don-t-use-GitPython-for-authors-check.patch
Patch03: 0003-Made-jenkins-email-pruning-more-resilient.patch
@@ -46,42 +48,44 @@ Patch09: 0009-Fix-the-grantee-group-loading-for-source-groups.patch
Patch10: 0010-Call-endheaders-when-auth_token-is-None.-Fixes-bug-8.patch
Patch11: 0011-Removed-db_pool-complexities-from-nova.db.sqlalchemy.patch
Patch12: 0012-Raise-InsufficientFreeMemory.patch
-Patch13: 0013-Don-t-leak-exceptions-out-to-users.patch
-Patch14: 0014-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch
-Patch15: 0015-Add-missing-author.patch
-Patch16: 0016-Make-snapshots-private-by-default.patch
-Patch17: 0017-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
-Patch18: 0018-Fixed-bug-lp850602.patch
-Patch19: 0019-bug-861310.patch
-Patch20: 0020-Enforce-snapshot-cleanup.patch
-Patch21: 0021-bug-lp845714.patch
-Patch22: 0022-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch
-Patch23: 0023-Adds-the-tenant-id-to-the-create-images-response-Loc.patch
-Patch24: 0024-Fixes-bug-862633-OS-api-consoles-create-broken.patch
-Patch25: 0025-Deallocate-ip-if-build-fails.patch
-Patch26: 0026-Stop-returning-correct-password-on-api-calls.patch
-Patch27: 0027-Handle-pidfile-exception-for-dnsmasq.patch
-Patch28: 0028-Make-sure-unknown-extensions-return-404.patch
-Patch29: 0029-Include-original-exception-in-ClassNotFound-exceptio.patch
-Patch30: 0030-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch
+Patch13: 0013-Add-missing-author.patch
+Patch14: 0014-Make-snapshots-private-by-default.patch
+Patch15: 0015-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
+Patch16: 0016-Fixed-bug-lp850602.patch
+Patch17: 0017-bug-861310.patch
+Patch18: 0018-Enforce-snapshot-cleanup.patch
+Patch19: 0019-bug-lp845714.patch
+Patch20: 0020-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch
+Patch21: 0021-Adds-the-tenant-id-to-the-create-images-response-Loc.patch
+Patch22: 0022-Fixes-bug-862633-OS-api-consoles-create-broken.patch
+Patch23: 0023-Deallocate-ip-if-build-fails.patch
+Patch24: 0024-Stop-returning-correct-password-on-api-calls.patch
+Patch25: 0025-Handle-pidfile-exception-for-dnsmasq.patch
+Patch26: 0026-Make-sure-unknown-extensions-return-404.patch
+Patch27: 0027-Include-original-exception-in-ClassNotFound-exceptio.patch
+Patch28: 0028-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch
+Patch29: 0029-Don-t-leak-exceptions-out-to-users.patch
+Patch30: 0030-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch
Patch31: 0031-Explicit-errors-on-confirm-revertResize-failures.patch
Patch32: 0032-Adds-ext4-and-reiserfs-to-_mount_filesystem.patch
Patch33: 0033-Improve-access-check-on-images.patch
Patch34: 0034-Fixes-bug-834633-Auto-assigning-floating-IPs.patch
Patch35: 0035-fixes-bug-883233.patch
-Patch36: 0036-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
-Patch37: 0037-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
-Patch38: 0038-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
-Patch39: 0039-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
-Patch40: 0040-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
-Patch41: 0041-Sanitize-EC2-manifests-and-image-tarballs.patch
-# These are fedora specific
-Patch100: openstack-nova-nonet.patch
+# This is a security fix
+Patch36: 0036-Sanitize-EC2-manifests-and-image-tarballs.patch
+
+# These are Fedora specific backports from master
+Patch37: 0037-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
+Patch38: 0038-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
+Patch39: 0039-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
+Patch40: 0040-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
+Patch41: 0041-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
+Patch42: 0042-Bug-898257-abstract-out-disk-image-access-methods.patch
+Patch43: 0043-Bug-898257-support-handling-images-with-libguestfs.patch
-# These are additional patches for upstream but not maintained at the above repo
-Patch200: 0001-Bug-898257-abstract-out-disk-image-access-methods.patch
-Patch201: 0002-Bug-898257-support-handling-images-with-libguestfs.patch
+# This is Fedora specific and not upstream
+Patch44: 0044-Ensure-we-don-t-access-the-net-when-building-docs.patch
BuildArch: noarch
BuildRequires: intltool
@@ -257,13 +261,9 @@ This package contains documentation files for nova.
%patch39 -p1
%patch40 -p1
%patch41 -p1
-
-# apply local patches
-%patch100 -p1
-
-# apply misc patches
-%patch200 -p1
-%patch201 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -450,6 +450,9 @@ fi
%endif
%changelog
+* Fri Jan 6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-15
+- Move recent patches into git (no functional changes)
+
* Fri Dec 30 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-14
- Don't require the fuse group (#770927)
- Require the fuse package (to avoid #767852)
More information about the scm-commits
mailing list