[openstack-nova] Update to latest 2011.3.1 release candidate Re-add nova-{clear-rabbit-queues, instance-usage-audit}
Mark McLoughlin
markmc at fedoraproject.org
Wed Jan 18 00:04:38 UTC 2012
commit e2eae752ae6e4c941c246e34095df34de8aa2490
Author: Mark McLoughlin <markmc at redhat.com>
Date: Wed Jan 18 00:04:28 2012 +0000
Update to latest 2011.3.1 release candidate
Re-add nova-{clear-rabbit-queues,instance-usage-audit}
.gitignore | 2 +-
...hain-rule-for-EC2-metadata-requests-lp-85.patch | 2 +-
...pi-add-the-INPUT-rule-for-EC2-metadata-lp.patch | 2 +-
...ser-to-choose-either-ietadm-or-tgtadm-lp-.patch | 2 +-
...e-VolumeDriver.sync_exec-method-lp-819997.patch | 2 +-
...tadm-tgtadm-calls-out-into-helper-classes.patch | 2 +-
...tgtadm-off-by-one-error.-Fixes-bug-871278.patch | 2 +-
...57-abstract-out-disk-image-access-methods.patch | 2 +-
...7-support-handling-images-with-libguestfs.patch | 2 +-
...estfs-operation-with-specified-partitions.patch | 2 +-
...e-don-t-access-the-net-when-building-docs.patch | 2 +-
openstack-nova.spec | 15 +++++++++------
sources | 2 +-
13 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ee45db..dcadecc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nova-2011.3.1~20120117.10814.tar.gz
+/nova-2011.3.1~20120117.10818.tar.gz
diff --git a/0001-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch b/0001-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
index feed969..10cd866 100644
--- a/0001-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
+++ b/0001-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
@@ -1,4 +1,4 @@
-From 47f04fbc4ca9afc7b983a5f8049e0a979a8dbff9 Mon Sep 17 00:00:00 2001
+From 8574faa359ca09cd99c54483e413eebaf7479277 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] Add INPUT chain rule for EC2 metadata requests (lp:856385)
diff --git a/0002-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch b/0002-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
index bad6737..a8248a4 100644
--- a/0002-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
+++ b/0002-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
@@ -1,4 +1,4 @@
-From 97f7fb494176135272bdd8a7f158732c2fa45409 Mon Sep 17 00:00:00 2001
+From 87ebe9d79c40cefbec595a4684289af058bb1c48 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] Have nova-api add the INPUT rule for EC2 metadata
diff --git a/0003-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch b/0003-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
index 3d57ad4..703c37e 100644
--- a/0003-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
+++ b/0003-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
@@ -1,4 +1,4 @@
-From 47de2a993542638fe1d0479238cd30901888e738 Mon Sep 17 00:00:00 2001
+From b72b3577c6974b2fe52c2076260a332f7233f752 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] Allow the user to choose either ietadm or tgtadm (lp:819997)
diff --git a/0004-Remove-VolumeDriver.sync_exec-method-lp-819997.patch b/0004-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
index 12c2589..46eaea2 100644
--- a/0004-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
+++ b/0004-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
@@ -1,4 +1,4 @@
-From 0c09b416d34bcd37e4bc6fa55b15180e0b5711f3 Mon Sep 17 00:00:00 2001
+From 0116537957ea1bae7a7c2092c2974250ed8ea10f 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] Remove VolumeDriver.sync_exec method (lp:819997)
diff --git a/0005-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch b/0005-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
index 8241503..789ef0b 100644
--- a/0005-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
+++ b/0005-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
@@ -1,4 +1,4 @@
-From b79a50d5d6922a174f7ca1a767b822c8cb3ca83d Mon Sep 17 00:00:00 2001
+From d972b5aab96b0648a78e9c123fdbaded037604d4 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] Refactor ietadm/tgtadm calls out into helper classes
diff --git a/0006-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch b/0006-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
index e87ec67..a26016f 100644
--- a/0006-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
+++ b/0006-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
@@ -1,4 +1,4 @@
-From 36b2cf2443eb570920d08c282213ccf54586519a Mon Sep 17 00:00:00 2001
+From 0c93e4c4873fde83ec0e572615d9307404e391b2 Mon Sep 17 00:00:00 2001
From: Chuck Short <chuck.short at canonical.com>
Date: Tue, 13 Dec 2011 13:45:43 -0500
Subject: [PATCH] Fix tgtadm off by one error. Fixes bug #871278
diff --git a/0007-Bug-898257-abstract-out-disk-image-access-methods.patch b/0007-Bug-898257-abstract-out-disk-image-access-methods.patch
index ee595e4..a78928f 100644
--- a/0007-Bug-898257-abstract-out-disk-image-access-methods.patch
+++ b/0007-Bug-898257-abstract-out-disk-image-access-methods.patch
@@ -1,4 +1,4 @@
-From 4083639c0aa0b898b9a9443b5c1ad13d50d51f80 Mon Sep 17 00:00:00 2001
+From 7646652683d45bc34e01a2b1e19157b924fee8a9 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] Bug#898257 abstract out disk image access methods
diff --git a/0008-Bug-898257-support-handling-images-with-libguestfs.patch b/0008-Bug-898257-support-handling-images-with-libguestfs.patch
index 133b7df..75dfc3d 100644
--- a/0008-Bug-898257-support-handling-images-with-libguestfs.patch
+++ b/0008-Bug-898257-support-handling-images-with-libguestfs.patch
@@ -1,4 +1,4 @@
-From b9febc6293c423edb7744162566548c462cf0db1 Mon Sep 17 00:00:00 2001
+From e240840e3cbc4cdbed11b5a3e257328e775edcf5 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] Bug#898257 support handling images with libguestfs
diff --git a/0009-Fix-libguestfs-operation-with-specified-partitions.patch b/0009-Fix-libguestfs-operation-with-specified-partitions.patch
index 34763f7..da8ea92 100644
--- a/0009-Fix-libguestfs-operation-with-specified-partitions.patch
+++ b/0009-Fix-libguestfs-operation-with-specified-partitions.patch
@@ -1,4 +1,4 @@
-From a7d3b295dc3468a3a7c9b256434dc9e6fa2becdb Mon Sep 17 00:00:00 2001
+From 0f8980bcd3e6932c9ba57d3470b8a177e49e7554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Tue, 10 Jan 2012 10:54:21 +0000
Subject: [PATCH] Fix libguestfs operation with specified partitions
diff --git a/0010-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0010-Ensure-we-don-t-access-the-net-when-building-docs.patch
index d16a5a7..cf4662f 100644
--- a/0010-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0010-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From 2dfbdaf61503bca6f0acbe76343f5375944850f2 Mon Sep 17 00:00:00 2001
+From 72682e2e4eb50f827119162b257b05b5846f2f1b 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] Ensure we don't access the net when building docs
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 005188a..4a2a1ae 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -1,11 +1,11 @@
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
-%global revno 10814
+%global revno 10818
%global snapshot ~20120117.%{revno}
Name: openstack-nova
Version: 2011.3.1
-Release: 0.3.%{revno}%{?dist}
+Release: 0.4.%{revno}%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
@@ -33,7 +33,7 @@ Source23: openstack-nova-db-setup
#
# Patches managed here: https://github.com/markmc/nova/tree/fedora-patches
#
-# $> git format-patch -N 2011.3.1-20120117.10814
+# $> git format-patch -N 2011.3.1-20120117.10818
# $> for p in 00*.patch; do filterdiff -x '*/.gitignore' -x '*/.mailmap' $p | sponge $p; done
# $> 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
@@ -223,9 +223,8 @@ popd
# Give stack, instance-usage-audit and clear_rabbit_queues a reasonable prefix
mv %{buildroot}%{_bindir}/stack %{buildroot}%{_bindir}/nova-stack
-# Disabled while waiting for https://bugs.launchpad.net/nova/+bug/917676
-# mv %{buildroot}%{_bindir}/instance-usage-audit %{buildroot}%{_bindir}/nova-instance-usage-audit
-# mv %{buildroot}%{_bindir}/clear_rabbit_queues %{buildroot}%{_bindir}/nova-clear-rabbit-queues
+mv %{buildroot}%{_bindir}/instance-usage-audit %{buildroot}%{_bindir}/nova-instance-usage-audit
+mv %{buildroot}%{_bindir}/clear_rabbit_queues %{buildroot}%{_bindir}/nova-clear-rabbit-queues
# Setup directories
install -d -m 755 %{buildroot}%{_sharedstatedir}/nova
@@ -381,6 +380,10 @@ fi
%endif
%changelog
+* Wed Jan 18 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.4.10818%{?dist}
+- Update to latest 2011.3.1 release candidate
+- Re-add nova-{clear-rabbit-queues,instance-usage-audit}
+
* Tue Jan 17 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.3.10814
- nova-stack isn't missing after all
diff --git a/sources b/sources
index 5a1424d..a0dc698 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ab65f95e6111c36b292a850920705a3 nova-2011.3.1~20120117.10814.tar.gz
+3b13fba7bc58222136d075936bb0a482 nova-2011.3.1~20120117.10818.tar.gz
More information about the scm-commits
mailing list