-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
-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
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
-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
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
--- /dev/null
+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)
%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
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
Group: Applications/System
Requires: sudo
-
Requires: MySQL-python
+Requires: qemu-img
+
Requires: python-paramiko
Requires: python-qpid
Requires: python-anyjson
Requires: python-cheetah
Requires: python-stevedore
+Requires: python-suds
Requires: python-sqlalchemy0.7
Requires: python-migrate
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
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
+%patch0004 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
%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
Code Review / openstack-build / cinder-build.git / commitdiff