-cinder (1:2013.2-0ubuntu1~cloud0) precise-havana; urgency=low
+cinder (1:2014.1~b3-0ubuntu1~cloud0) precise-icehouse; urgency=low
* New upstream release for the Ubuntu Cloud Archive.
- -- James Page <james.page@ubuntu.com> Wed, 16 Oct 2013 11:27:06 +0100
+ -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com> Wed, 29 Jan 2014 02:54:51 -0500
+
+cinder (1:2014.1~b2-0ubuntu1) trusty; urgency=low
+
+ [ James Page ]
+ * d/control: Add versioned dependency python-six >= 1.4.1 (LP: #1259203).
+ * d/p/*: Refreshed.
+
+ [Chuck Short]
+ * New upstream release.
+ * debian/control: Add python-taskflow as a dependency.
+ * debian/control: Add python-oslo.rootwrap as a dependency.
+
+ -- Chuck Short <zulcss@ubuntu.com> Thu, 23 Jan 2014 12:41:54 -0500
+
+cinder (1:2014.1~b1-0ubuntu1) trusty; urgency=low
+
+ [ Chuck Short ]
+ * New upstream release.
+ * debian/control:
+ - Open icehouse release.
+ - Add python-rtslib as a dependency.
+ * debian/patches/fix-sqlalchemy-requirements.patch: Dropped no longer needed.
+ * debian/patches/fix-babel-requirements.patch: Dropped no longer needed.
+ * debian/paches/fix-requirements.patch: Fixed up requirements.txt for
+ dependencies we have in Ubuntu.
+ * debian/cinder-common.install: Add "cinder-rtstool".
+
+ [ James Page ]
+ * debian/patches/*: Refresh.
+
+ -- Chuck Short <zulcss@ubuntu.com> Thu, 05 Dec 2013 21:30:40 -0500
+
+cinder (1:2013.2-0ubuntu1) saucy; urgency=low
+
+ * New upstream release (LP: #1236462).
+
+ -- Chuck Short <zulcss@ubuntu.com> Thu, 17 Oct 2013 10:00:43 -0400
cinder (1:2013.2~rc3-0ubuntu1) saucy; urgency=low
usr/bin/cinder-manage
usr/bin/cinder-rootwrap
usr/bin/cinder-rpc-zmq-receiver
+usr/bin/cinder-rtstool
python-netaddr,
python-novaclient (>= 1:2.15.0),
python-oslo.config (>= 1:1.1.0),
+ python-oslo.rootwrap,
python-paramiko (>= 1.8),
python-paste,
python-pastedeploy,
python-pbr (>= 0.5.21),
python-routes,
python-setuptools,
- python-six,
+ python-six (>= 1.4.1),
python-sphinx,
python-sqlalchemy (>= 0.8.2),
python-stevedore (>= 0.10),
python-suds,
python-swiftclient (>= 1:1.5),
+ python-taskflow,
python-testtools (>= 0.9.32),
python-webob (>= 1.2.3),
testrepository (>= 0.0.17)
Standards-Version: 3.9.4
Homepage: http://launchpad.net/cinder
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/cinder/havana/files
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/cinder/havana
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/cinder/icehouse/files
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/cinder/icehouse
XS-Testsuite: autopkgtest
Package: python-cinder
python-eventlet (>= 0.13.0),
python-glanceclient (>= 1:0.9.0),
python-greenlet (>= 0.3.2),
- python-importlib,
python-iso8601,
python-keystoneclient (>= 1:0.3.0),
python-kombu (>= 2.5.12),
python-lockfile,
python-lxml (>= 2.3),
python-migrate,
- python-mysqldb,
python-netaddr,
python-novaclient (>= 1:2.12.0),
python-oslo.config (>= 1:1.1.0),
python-paste,
python-pastedeploy,
python-routes,
- python-six,
+ python-six (>= 1.4.1),
python-sqlalchemy (>= 0.8.2),
python-stevedore (>= 0.10),
python-suds,
python-swiftclient (>= 1:1.5),
+ python-taskflow,
python-webob (>= 1.2.3),
${misc:Depends},
${python:Depends}
+++ /dev/null
-Author: Revert new babel requirements.
-Author: Chuck Short <zulcss@ubuntu.com>
-Forwarded: No, https://review.openstack.org/#/c/48739/
-diff --git a/requirements.txt b/requirements.txt
-index 219962d..01ec2e6 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -2,7 +2,7 @@ pbr>=0.5.21,<1.0
- amqplib>=0.6.1
- anyjson>=0.3.3
- argparse
--Babel>=1.3
-+Babel>=0.9.6
- eventlet>=0.13.0
- greenlet>=0.3.2
- iso8601>=0.1.8
-
--- /dev/null
+From 060b0f3424625e6b6cce3dccb3fb7c1749cde089 Mon Sep 17 00:00:00 2001
+From: Dmitry Burmistrov <dburmistrov@mirantis.com>
+Date: Thu, 13 Mar 2014 22:32:41 +0400
+Subject: [PATCH] fix-requirements
+
+---
+ requirements.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index c21d847..cc6b9e7 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -20,7 +20,6 @@ python-novaclient>=2.15.0
+ python-swiftclient>=1.6
+ Routes>=1.12.3
+ taskflow>=0.1.3,<0.2
+-rtslib-fb>=2.1.39
+ six>=1.5.2
+ SQLAlchemy>=0.7.8,<=0.8.99
+ sqlalchemy-migrate>=0.8.2,!=0.8.4
+--
+1.7.9.5
+
+++ /dev/null
-diff -Naurp cinder-2013.2.rc1.orig/requirements.txt cinder-2013.2.rc1/requirements.txt
---- cinder-2013.2.rc1.orig/requirements.txt 2013-10-04 05:11:50.000000000 -0400
-+++ cinder-2013.2.rc1/requirements.txt 2013-10-04 08:33:32.072164528 -0400
-@@ -20,7 +20,7 @@ python-novaclient>=2.15.0
- python-swiftclient>=1.5
- Routes>=1.12.3
- six>=1.4.1
--SQLAlchemy>=0.7.8,<=0.7.99
-+SQLAlchemy>=0.7.8,<=0.8.99
- sqlalchemy-migrate>=0.7.2
- stevedore>=0.10
- suds>=0.4
-fix-sqlalchemy-requirements.patch
-fix-babel-requirements.patch
+fix-requirements.patch
-From 9904118c6d3d130624eaec31878649e41efd1bc2 Mon Sep 17 00:00:00 2001
+From 76866b3d32ff32bc2df6f89b5636d29ae4438fd4 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
+Subject: [PATCH 1/4] Ensure we don't access the net when building docs
(Note, this has not been sent upstream)
---
- doc/source/conf.py | 1 -
+ doc/source/conf.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index e27d458..7a2bf1a 100644
+index 97ee288..238a922 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -29,7 +29,6 @@ sys.path.insert(0, os.path.abspath('./'))
'ext.cinder_todo',
'sphinx.ext.coverage',
'sphinx.ext.pngmath',
+--
+1.7.9.5
+
-From c8b9384ccf0e9c69f35978f3abbb5e5d5638d859 Mon Sep 17 00:00:00 2001
+From 7a3bca73776b8a410238922dd012109a6c0a6d59 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
+Subject: [PATCH 2/4] Use updated parallel install versions of epel package
Use sqlalchemy >= 0.6.3 WebOb >= 1.2 Routes >= 1.12.3 PasteDeploy >= 1.5.0
and depend on the parallel installable
Delve into pkg_resources a little to get it to modify sys.path,
so that our parallel installed egg takes precedence over the
system default module versions.
+
+Conflicts:
+ cinder/db/sqlalchemy/migration.py
---
- bin/cinder-manage | 4 +++-
- cinder/__init__.py | 30 ++++++++++++++++++++++++++++++
- cinder/db/sqlalchemy/migration.py | 7 ++++++-
- 3 files changed, 39 insertions(+), 2 deletions(-)
+ bin/cinder-manage | 4 +++-
+ cinder/__init__.py | 30 +++++++++++++++++++++++++
+ cinder/db/sqlalchemy/migration.py | 44 ++++++++++++++++++++++++++++++++++++-
+ 3 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/bin/cinder-manage b/bin/cinder-manage
-index 3c05d77..9474e2e 100755
+index 7b113c8..2336dc7 100755
--- a/bin/cinder-manage
+++ b/bin/cinder-manage
-@@ -62,7 +62,6 @@ import sys
+@@ -60,7 +60,6 @@ import sys
from oslo.config import cfg
# If ../cinder/__init__.py exists, add ../ to Python search path, so that
# it will override what happens to be installed in /usr/(local/)lib/python...
POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
-@@ -84,6 +83,9 @@ from cinder.openstack.common import uuidutils
+@@ -83,6 +82,9 @@ from cinder.openstack.common import uuidutils
from cinder import utils
from cinder import version
CONF = cfg.CONF
diff --git a/cinder/__init__.py b/cinder/__init__.py
-index d765b08..720320e 100644
+index 2b43c2f..da4fb0a 100644
--- a/cinder/__init__.py
+++ b/cinder/__init__.py
-@@ -30,3 +30,33 @@
+@@ -28,3 +28,33 @@
.. moduleauthor:: Manish Singh <yosh@gimp.org>
.. moduleauthor:: Andy Smith <andy@anarkystic.com>
"""
+import paste
+paste.__path__.insert(0, paste.__path__.pop(-1))
diff --git a/cinder/db/sqlalchemy/migration.py b/cinder/db/sqlalchemy/migration.py
-index e2463bc..9ba7b73 100644
+index ebfdff8..9b3acd5 100644
--- a/cinder/db/sqlalchemy/migration.py
+++ b/cinder/db/sqlalchemy/migration.py
-@@ -56,7 +56,12 @@ if (not hasattr(migrate, '__version__') or
+@@ -17,7 +17,49 @@
+ import os
- # NOTE(jkoelker) Delay importing migrate until we are patched
-from migrate import exceptions as versioning_exceptions
++import distutils.version as dist_version
++import migrate
++from migrate.versioning import util as migrate_util
++import sqlalchemy
++
++from cinder.db import migration
++from cinder.db.sqlalchemy.api import get_engine
++from cinder import exception
++from cinder.openstack.common import log as logging
++
++
++LOG = logging.getLogger(__name__)
++
++
++@migrate_util.decorator
++def patched_with_engine(f, *a, **kw):
++ url = a[0]
++ engine = migrate_util.construct_engine(url, **kw)
++
++ try:
++ kw['engine'] = engine
++ return f(*a, **kw)
++ finally:
++ if isinstance(engine, migrate_util.Engine) and engine is not url:
++ migrate_util.log.debug('Disposing SQLAlchemy engine %s', engine)
++ engine.dispose()
++
++
++# TODO(jkoelker) When migrate 0.7.3 is released and cinder depends
++# on that version or higher, this can be removed
++MIN_PKG_VERSION = dist_version.StrictVersion('0.7.3')
++if (not hasattr(migrate, '__version__') or
++ dist_version.StrictVersion(migrate.__version__) < MIN_PKG_VERSION):
++ migrate_util.with_engine = patched_with_engine
++
++
++# NOTE(jkoelker) Delay importing migrate until we are patched
+try:
+ # Try the more specific path first (migrate <= 0.6)
+ from migrate.versioning import exceptions as versioning_exceptions
+ from migrate import exceptions as versioning_exceptions
from migrate.versioning import api as versioning_api
from migrate.versioning.repository import Repository
-
+ import sqlalchemy
+--
+1.7.9.5
+
-From 6ed6db76f6e6b1a579d07c3db63283d444385c14 Mon Sep 17 00:00:00 2001
+From e3e393decb5652cee285c2bce010f29e5be9f52e Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Thu, 13 Jun 2013 17:50:12 -0400
-Subject: [PATCH] Remove runtime dep on python-pbr, python-d2to1
+Subject: [PATCH 3/4] Remove runtime dep on python-pbr, python-d2to1
Requires RPM spec to fill in REDHATCINDERVERSION.
---
- cinder/version.py | 16 +++++++++++++---
+ cinder/version.py | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/cinder/version.py b/cinder/version.py
-index ad1ebc0..b4f6fd8 100644
+index e3dbd70..ab8f888 100644
--- a/cinder/version.py
+++ b/cinder/version.py
-@@ -14,12 +14,22 @@
+@@ -12,12 +12,22 @@
# License for the specific language governing permissions and limitations
# under the License.
+
+version_info = VersionInfo()
version_string = version_info.version_string
+--
+1.7.9.5
+
-From bd1bfd86fbeacd893ff5d9abb969c7b0c994fbf4 Mon Sep 17 00:00:00 2001
+From 7160125f84d383bdeea375a9cc7299ce6be2e8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Mon, 22 Jul 2013 03:14:27 +0100
-Subject: [PATCH] Revert "Use oslo.sphinx and remove local copy of doc theme"
+Subject: [PATCH 4/4] Revert "Use oslo.sphinx and remove local copy of doc
+ theme"
This reverts commit 8b1ae18ba95f04fedc04592b419401d75d448543.
test-requirements.txt
---
- doc/source/_static/.gitignore | 0
- doc/source/_static/.placeholder | 0
- doc/source/_static/basic.css | 416 +++++++++++++++++++++++++++++++++++++
- doc/source/_static/default.css | 230 ++++++++++++++++++++
- doc/source/_static/jquery.tweet.js | 154 ++++++++++++++
- doc/source/_static/tweaks.css | 218 +++++++++++++++++++
- doc/source/_templates/.gitignore | 0
- doc/source/_templates/.placeholder | 0
- doc/source/_theme/layout.html | 95 +++++++++
- doc/source/_theme/theme.conf | 5 +
- doc/source/conf.py | 8 +-
- test-requirements.txt | 1 -
- 12 files changed, 1121 insertions(+), 6 deletions(-)
+ doc/source/_static/basic.css | 416 ++++++++++++++++++++++++++++++++++++
+ doc/source/_static/default.css | 230 ++++++++++++++++++++
+ doc/source/_static/jquery.tweet.js | 154 +++++++++++++
+ doc/source/_static/tweaks.css | 218 +++++++++++++++++++
+ doc/source/_theme/layout.html | 95 ++++++++
+ doc/source/_theme/theme.conf | 5 +
+ doc/source/conf.py | 8 +-
+ test-requirements.txt | 1 -
+ 8 files changed, 1121 insertions(+), 6 deletions(-)
create mode 100644 doc/source/_static/.gitignore
create mode 100644 doc/source/_static/.placeholder
create mode 100644 doc/source/_static/basic.css
+pygments_style = friendly
+
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 7a2bf1a..01bd3b4 100644
+index 238a922..58fc367 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,9 +33,7 @@ extensions = ['sphinx.ext.autodoc',
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
diff --git a/test-requirements.txt b/test-requirements.txt
-index 3d8e9bf..f83b20b 100644
+index 15308b9..cabe88a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
-@@ -12,4 +12,3 @@ sphinx>=1.1.2
- python-subunit
- testtools>=0.9.32
- testrepository>=0.0.17
+@@ -13,4 +13,3 @@ sphinx>=1.1.2,<1.2
+ python-subunit>=0.0.18
+ testtools>=0.9.34
+ testrepository>=0.0.18
-oslo.sphinx
+--
+1.7.9.5
+
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-cinder
-Version: 2013.2
-Release: 0.9.b3%{?dist}
+Version: 2014.1
+Release: 0.2.b3%{?dist}
Summary: OpenStack Volume service
Group: Applications/System
License: ASL 2.0
URL: http://www.openstack.org/software/openstack-storage/
-Source0: https://launchpad.net/cinder/havana/havana-3/+download/cinder-%{version}.b3.tar.gz
+Source0: https://launchpad.net/cinder/icehouse/icehouse-1/+download/cinder-%{version}.b1.tar.gz
Source1: cinder-dist.conf
Source2: cinder.logrotate
Source3: cinder-tgt.conf
Source20: cinder-sudoers
#
-# patches_base=2013.2.b3
+# patches_base=2014.1.b1
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
Requires: python-qpid
Requires: python-kombu
Requires: python-amqplib
-Requires: python-importlib
Requires: python-eventlet
Requires: python-greenlet
Requires: python-glanceclient >= 1:0
Requires: python-swiftclient >= 1.2
Requires: python-keystoneclient
-Requires: python-novaclient >= 2.14
+Requires: python-novaclient >= 1:2.15
Requires: python-oslo-config >= 1:1.2.0
-Requires: python-six
+Requires: python-six >= 1.4.1
Requires: python-babel
Requires: python-lockfile
exit 0
%post
-if [ $1 -eq 1 ] ; then
- # Initial installation
- for svc in volume api scheduler; do
- /sbin/chkconfig --add openstack-cinder-$svc
- done
-fi
+for svc in volume api scheduler backup; do
+ /sbin/chkconfig --add openstack-cinder-$svc
+done
%preun
if [ $1 -eq 0 ] ; then
- for svc in volume api scheduler; do
+ for svc in volume api scheduler backup; do
/sbin/service openstack-cinder-${svc} stop > /dev/null 2>&1
/sbin/chkconfig --del openstack-cinder-${svc}
done
%postun
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
- for svc in volume api scheduler; do
+ for svc in volume api scheduler backup; do
/sbin/service openstack-cinder-${svc} condrestart > /dev/null 2>&1 || :
done
fi
%endif
%changelog
+* Mon Jan 06 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1-0.2.b1
+- Set python-six min version to ensure updated
+
+* Thu Dec 19 2013 Eric Harney <eharney@redhat.com> - 2014.1-0.1.b1
+- Update to Icehouse milestone 1
+
+* Tue Dec 17 2013 Eric Harney <eharney@redhat.com> - 2013.2.1-1
+- Update to Havana stable release 1
+
+* Mon Oct 28 2013 Eric Harney <eharney@redhat.com> - 2013.2-2
+- Fix GlusterFS volume driver clone operations
+
+* Thu Oct 17 2013 Eric Harney <eharney@redhat.com> - 2013.2-1
+- Update to 2013.2 (Havana)
+- Handle cinder-backup service registration/restart/removal
+
+* Wed Oct 16 2013 Eric Harney <eharney@redhat.com> - 2013.2-0.13.rc3
+- Update to Havana RC3
+
+* Tue Oct 15 2013 Eric Harney <eharney@redhat.com> - 2013.2-0.12.rc2
+- Update to Havana RC2
+
+* Tue Oct 08 2013 Eric Harney <eharney@redhat.com> - 2013.2-0.11.rc1
+- Update to Havana RC1
+- Fix python-novaclient req epoch
+
+* Mon Sep 23 2013 Eric Harney <eharney@redhat.com> - 2013.2-0.10.b3
+- Depend on python-novaclient 2.15
+
* Wed Sep 18 2013 Eric Harney <eharney@redhat.com> - 2013.2-0.9.b3
- Add cinder-dist.conf
- Tighten permissions on /var/log/cinder
Code Review / openstack-build / cinder-build.git / commitdiff