Update spec 2013.1.3

Change-Id: I209c2455f6fb12fee803ba7331f9713cfda4b159

diff --git a/rpm/SOURCES/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/rpm/SOURCES/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index 38bc142a628440281867659d7fea01ebbabc8ce8..ee681acce5083e28b87f2e3d02ea9f3a8c7f740f 100644 (file)
--- a/rpm/SOURCES/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/rpm/SOURCES/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,12 +1,12 @@
-From 4c99afa1a11819f77099c4518171817a7a58da18 Mon Sep 17 00:00:00 2001
+From 6c5b2b229fcd9a30369335127980a39d644ca3c3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
 Date: Fri, 21 Sep 2012 13:33:26 +0100
 Subject: [PATCH] Ensure we don't access the net when building docs
 
 (Note, this has not been sent upstream)
 ---
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
+ doc/source/conf.py |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
 index 40e564b..01bd3b4 100644

diff --git a/rpm/SOURCES/0002-Use-updated-parallel-install-versions-of-epel-packag.patch b/rpm/SOURCES/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
index 8b587e36a22e7ebbce6e0514bed064e52227eb5e..d77a9444b6c7fd47a3da9440c15e74771b3e05b3 100644 (file)
--- a/rpm/SOURCES/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ b/rpm/SOURCES/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,4 +1,4 @@
-From 632186c1a4e3d971bab1d017ea3289e92c85d86c Mon Sep 17 00:00:00 2001
+From 2cd2b4092d529eebc2485567c92622fe3b055faa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
 Date: Wed, 24 Oct 2012 13:44:37 +0100
 Subject: [PATCH] Use updated parallel install versions of epel package
@@ -15,9 +15,9 @@ system default module versions.
 Conflicts:
        bin/cinder-manage
 ---
- bin/cinder-manage                 |  7 ++++---
- cinder/__init__.py                | 30 ++++++++++++++++++++++++++++++
- cinder/db/sqlalchemy/migration.py |  7 ++++++-
+ bin/cinder-manage                 |    7 ++++---
+ cinder/__init__.py                |   30 ++++++++++++++++++++++++++++++
+ cinder/db/sqlalchemy/migration.py |    7 ++++++-
  3 files changed, 40 insertions(+), 4 deletions(-)
 
 diff --git a/bin/cinder-manage b/bin/cinder-manage

diff --git a/rpm/SOURCES/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch b/rpm/SOURCES/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
index 37e6f4584c8e00d5fd672f01704a1a6faf3a8268..1d90078d50ca34fa852ff898c3672cd6a224cfe5 100644 (file)
--- a/rpm/SOURCES/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
+++ b/rpm/SOURCES/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
@@ -1,4 +1,4 @@
-From 2e3d9b429a79a9e6f39eba7907386bf30cb777d6 Mon Sep 17 00:00:00 2001
+From 7c0e9b09c2dd48f0f408f438bedd9c9676690592 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
 Date: Tue, 2 Apr 2013 14:44:51 +0100
 Subject: [PATCH] remove deprecated assert_unicode sqlalchemy attribute
@@ -9,8 +9,8 @@ http://docs.sqlalchemy.org/en/latest/changelog/changelog_08.html#change-ad44af79
 
 Change-Id: I305bfdbcd3c3669c41318ea34115624f729b3909
 ---
- cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py | 11 ++++-------
- cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py  | 11 -----------
+ .../migrate_repo/versions/002_quota_class.py       |   11 ++++-------
+ .../migrate_repo/versions/008_add_backup.py        |   11 -----------
  2 files changed, 4 insertions(+), 18 deletions(-)
 
 diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py

diff --git a/rpm/SOURCES/0004-avoid-code-path-causing-qpid-exchange-leaks.patch b/rpm/SOURCES/0004-avoid-code-path-causing-qpid-exchange-leaks.patch
new file mode 100644 (file)
index 0000000..d219d77
--- /dev/null
+++ b/rpm/SOURCES/0004-avoid-code-path-causing-qpid-exchange-leaks.patch
@@ -0,0 +1,26 @@
+From 9e65a17f9143616548c722231d0f4399c142bcd5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
+Date: Wed, 17 Jul 2013 16:03:44 +0100
+Subject: [PATCH] avoid code path causing qpid exchange leaks
+
+Always assume amqp_rpc_single_reply_queue is True,
+so that the problematic code path is ignored.
+The issue is discussed at https://pad.lv/1178375
+---
+ cinder/openstack/common/rpc/amqp.py |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/cinder/openstack/common/rpc/amqp.py b/cinder/openstack/common/rpc/amqp.py
+index 832511c..fd621c4 100644
+--- a/cinder/openstack/common/rpc/amqp.py
++++ b/cinder/openstack/common/rpc/amqp.py
+@@ -590,7 +590,8 @@ def multicall(conf, context, topic, msg, timeout, connection_pool):
+ 
+     # TODO(pekowski): Remove this flag and the code under the if clause
+     #                 in Havana.
+-    if not conf.amqp_rpc_single_reply_queue:
++    # (p-draigbrady): This clause is disabled to avoid qpid exchange leaks
++    if False and not conf.amqp_rpc_single_reply_queue:
+         conn = ConnectionContext(conf, connection_pool)
+         wait_msg = MulticallWaiter(conf, conn, timeout)
+         conn.declare_direct_consumer(msg_id, wait_msg)

diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec
index 43c20171b4886f3b899b22648da569d9280e3689..1830b3e172f55928bf38b78927fd26b32b178ed7 100644 (file)
--- a/rpm/SPECS/openstack-cinder.spec
+++ b/rpm/SPECS/openstack-cinder.spec
@@ -1,14 +1,14 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:             openstack-cinder
-Version:          2013.1.1
-Release:          1%{?dist}
+Version:          2013.1.2
+Release:          4%{?dist}
 Summary:          OpenStack Volume service
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://www.openstack.org/software/openstack-storage/
-Source0:          cinder-%{version}.tar.gz
+Source0:          https://launchpad.net/cinder/grizzly/%{version}/+download/cinder-%{version}.tar.gz
 Source1:          cinder.conf
 Source2:          cinder.logrotate
 Source3:          cinder-tgt.conf
@@ -23,11 +23,12 @@ Source120:        openstack-cinder-volume.upstart
 Source20:         cinder-sudoers
 
 #
-# patches_base=2013.1.1
+# patches_base=2013.1.2
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
 Patch0003: 0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
+Patch0004: 0004-avoid-code-path-causing-qpid-exchange-leaks.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -65,9 +66,10 @@ Summary:          OpenStack Volume Python libraries
 Group:            Applications/System
 
 Requires:         sudo
-
 Requires:         MySQL-python
 
+Requires:         qemu-img
+
 Requires:         python-paramiko
 
 Requires:         python-qpid
@@ -82,6 +84,7 @@ Requires:         python-lxml
 Requires:         python-anyjson
 Requires:         python-cheetah
 Requires:         python-stevedore
+Requires:         python-suds
 
 Requires:         python-sqlalchemy0.7
 Requires:         python-migrate
@@ -91,6 +94,8 @@ Requires:         python-routes1.12
 Requires:         python-webob1.0
 
 Requires:         python-glanceclient >= 1:0
+Requires:         python-keystoneclient
+Requires:         python-oslo-config
 
 %description -n   python-cinder
 OpenStack Volume (codename Cinder) provides services to manage and
@@ -128,6 +133,7 @@ This package contains documentation files for cinder.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -282,6 +288,18 @@ fi
 %endif
 
 %changelog
+* Mon Jul 22 2013 Pádraig Brady <pbrady@redhat.com> - 2013.1.2-4
+- Add dependency on python-suds to support the netapp driver
+- Add dependency on python-keystoneclient for auth token middleware
+- Add dependency on python-oslo-config new in Grizzly
+- Add dependency on qemu-img for volume creation from Glance images
+
+* Wed Jul 17 2013 Pádraig Brady <pbrady@redhat.com> - 2013.1.2-2
+- Avoid qpid exchange leaks
+
+* Mon Jun 20 2013 Eric Harney <eharney@redhat.com> - 2013.1.2-1
+- Update to Grizzly stable release 2
+
 * Fri May 10 2013 Eric Harney <eharney@redhat.com> - 2013.1.1-1
 - Update to Grizzly stable release 1