From b67e0494641b64528082c68695783adb0ebc8795 Mon Sep 17 00:00:00 2001 From: Dmitry Burmistrov Date: Thu, 3 Apr 2014 21:06:50 +0400 Subject: [PATCH] Update specs to v. 2014.1.rc1 --- debian/changelog | 53 +++++++++++++++++-- debian/cinder-common.postinst | 7 +-- debian/control | 8 ++- debian/patches/fix-requirements.patch | 19 ++----- debian/rules | 2 +- ...-t-access-the-net-when-building-docs.patch | 4 +- ...llel-install-versions-of-epel-packag.patch | 18 ++----- ...ntime-dep-on-python-pbr-python-d2to1.patch | 2 +- ...sphinx-and-remove-local-copy-of-doc-.patch | 10 ++-- rpm/SPECS/openstack-cinder.spec | 2 +- 10 files changed, 79 insertions(+), 46 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0181889a..12b040f8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,55 @@ -cinder (1:2014.1~b3-0ubuntu1~cloud0) precise-icehouse; urgency=low +cinder (1:2014.1~rc1-0ubuntu1~cloud0) precise-icehouse; urgency=medium - * New upstream release for the Ubuntu Cloud Archive. + * New update for the Ubuntu Cloud Archive. - -- Openstack Ubuntu Testing Bot Wed, 29 Jan 2014 02:54:51 -0500 + -- Openstack Ubuntu Testing Bot Tue, 01 Apr 2014 00:05:17 -0400 + +cinder (1:2014.1~rc1-0ubuntu1) trusty; urgency=medium + + * New upstream release (LP: #1299010). + * debian/patches/fixup-rbd-str-handling.patch: Dropped no longer needed. + * debian/patches/fix-requirements.patch: Rediffed. + * debian/control: Add python-oslo.messaging. + + -- Chuck Short Fri, 28 Mar 2014 09:48:21 -0400 + +cinder (1:2014.1~b3-0ubuntu3) trusty; urgency=medium + + * d/p/fixup-rbd-str-handling.patch: Cherry pick fix from upstream + Gerrit to resolve issue deleting Ceph volumes and snapshots + (LP: #1292433). + * d/control,rules: Use upstream run_tests.sh wrapper to execute unit tests, + add subunit to BD's to ensure output is correctly formatted. + + -- James Page Fri, 14 Mar 2014 11:19:16 +0000 + +cinder (1:2014.1~b3-0ubuntu2) trusty; urgency=medium + + * d/cinder-common.postinst: Correct use of getent (LP: #1224275). + * d/cinder-common.postinst: Tidy detection of local sqlite database use + for db sync operations (LP: #1290423). + + -- James Page Thu, 13 Mar 2014 10:11:20 +0000 + +cinder (1:2014.1~b3-0ubuntu1) trusty; urgency=medium + + [ Chuck Short ] + * debian/patches/fix-requirements.patch: Refreshed. + * debian/control: Bump python-keystoneclient to 0.4.2. + * debian/patches/skip-tests.patch: Temporarily skip + testlefthand tests since the needed python library hasnt been + packaged yet. + + [ James Page ] + * d/p/fix-requirements.patch: Refreshed. + * d/control,d/p/series/skip-tests.patch: Add BD on python-hplefthandclient, + bump version requirement on python-hp3parclient to >= 3.0.0 and drop + patch that skips hplefthandclient tests. + + [ Corey Bryant ] + * New upstream release. + + -- Corey Bryant Thu, 06 Mar 2014 13:16:02 -0500 cinder (1:2014.1~b2-0ubuntu1) trusty; urgency=low diff --git a/debian/cinder-common.postinst b/debian/cinder-common.postinst index 3443c56fa..8045dbffb 100644 --- a/debian/cinder-common.postinst +++ b/debian/cinder-common.postinst @@ -1,11 +1,11 @@ #!/bin/sh -e if [ "$1" = "configure" ]; then - if ! getenv group cinder > /dev/null 2>&1; then + if ! getent group cinder > /dev/null 2>&1; then addgroup --system cinder >/dev/null fi - if ! getenv passwd cinder > /dev/null 2>&1; then + if ! getent passwd cinder > /dev/null 2>&1; then adduser --system --home /var/lib/cinder --ingroup cinder --no-create-home \ --shell /bin/false cinder fi @@ -19,7 +19,8 @@ if [ "$1" = "configure" ]; then chmod 0755 /etc/cinder/rootwrap.d chown root:root /etc/cinder/rootwrap.conf - if ! grep -q sql_connection /etc/cinder/cinder.conf + if ! grep -qE "^(sql_)?connection.*" /etc/cinder/cinder.conf || \ + grep -qE "^(sql_)?connection.*sqlite.*" /etc/cinder/cinder.conf then su -s /bin/sh -c 'cinder-manage db sync' cinder fi diff --git a/debian/control b/debian/control index aa9f0e9eb..4363fb596 100644 --- a/debian/control +++ b/debian/control @@ -13,9 +13,10 @@ Build-Depends-Indep: python-fixtures (>= 0.3.14), python-glanceclient (>= 1:0.9.0), python-greenlet (>= 0.3.2), - python-hp3parclient (>= 2.0.0), + python-hp3parclient (>= 3.0.0), + python-hplefthandclient (>= 1.0.0), python-iso8601, - python-keystoneclient (>= 1:0.3.0), + python-keystoneclient (>= 1:0.4.2), python-kombu (>= 2.5.12), python-lockfile, python-lxml (>= 2.3), @@ -27,6 +28,7 @@ Build-Depends-Indep: python-novaclient (>= 1:2.15.0), python-oslo.config (>= 1:1.1.0), python-oslo.rootwrap, + python-oslo.messaging, python-paramiko (>= 1.8), python-paste, python-pastedeploy, @@ -42,6 +44,7 @@ Build-Depends-Indep: python-taskflow, python-testtools (>= 0.9.32), python-webob (>= 1.2.3), + subunit, testrepository (>= 0.0.17) Standards-Version: 3.9.4 Homepage: http://launchpad.net/cinder @@ -68,6 +71,7 @@ Depends: python-netaddr, python-novaclient (>= 1:2.12.0), python-oslo.config (>= 1:1.1.0), + python-oslo.messaging, python-paramiko (>= 1.8), python-paste, python-pastedeploy, diff --git a/debian/patches/fix-requirements.patch b/debian/patches/fix-requirements.patch index aab092c65..3f73bcceb 100644 --- a/debian/patches/fix-requirements.patch +++ b/debian/patches/fix-requirements.patch @@ -1,24 +1,13 @@ -From 060b0f3424625e6b6cce3dccb3fb7c1749cde089 Mon Sep 17 00:00:00 2001 -From: Dmitry Burmistrov -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 +index 956c5de..1033d31 100644 --- a/requirements.txt +++ b/requirements.txt -@@ -20,7 +20,6 @@ python-novaclient>=2.15.0 - python-swiftclient>=1.6 +@@ -22,7 +22,6 @@ python-swiftclient>=1.6 + requests>=1.1 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>=0.7.8,<=0.9.99 sqlalchemy-migrate>=0.8.2,!=0.8.4 --- -1.7.9.5 diff --git a/debian/rules b/debian/rules index d4ef58857..f38a7dc14 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ get-orig-source: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - testr init && testr run + ./run_tests.sh -N -P endif override_dh_install: 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 1565e66e9..33f414193 100644 --- 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,4 +1,4 @@ -From 76866b3d32ff32bc2df6f89b5636d29ae4438fd4 Mon Sep 17 00:00:00 2001 +From 2a3566b8f56014f3e39f3e5823fb45dd202a8bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Fri, 21 Sep 2012 13:33:26 +0100 Subject: [PATCH 1/4] Ensure we don't access the net when building docs @@ -9,7 +9,7 @@ Subject: [PATCH 1/4] Ensure we don't access the net when building docs 1 file changed, 1 deletion(-) diff --git a/doc/source/conf.py b/doc/source/conf.py -index 97ee288..238a922 100644 +index 42a4340..ac2eadc 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -29,7 +29,6 @@ sys.path.insert(0, os.path.abspath('./')) 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 f7ffd4904..f9c60527e 100644 --- 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 7a3bca73776b8a410238922dd012109a6c0a6d59 Mon Sep 17 00:00:00 2001 +From 433133a658c36ae5f7fc16f1679908c13205fcff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Wed, 24 Oct 2012 13:44:37 +0100 Subject: [PATCH 2/4] Use updated parallel install versions of epel package @@ -14,24 +14,16 @@ system default module versions. Conflicts: cinder/db/sqlalchemy/migration.py --- - bin/cinder-manage | 4 +++- + bin/cinder-manage | 3 +++ cinder/__init__.py | 30 +++++++++++++++++++++++++ cinder/db/sqlalchemy/migration.py | 44 ++++++++++++++++++++++++++++++++++++- - 3 files changed, 76 insertions(+), 2 deletions(-) + 3 files changed, 76 insertions(+), 1 deletion(-) diff --git a/bin/cinder-manage b/bin/cinder-manage -index 7b113c8..2336dc7 100755 +index c9eec4a..ef7329c 100755 --- a/bin/cinder-manage +++ b/bin/cinder-manage -@@ -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]), -@@ -83,6 +82,9 @@ from cinder.openstack.common import uuidutils +@@ -83,6 +83,9 @@ from cinder import rpc from cinder import utils from cinder import version diff --git a/rpm/SOURCES/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch b/rpm/SOURCES/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch index 70babf503..83e7590ea 100644 --- a/rpm/SOURCES/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch +++ b/rpm/SOURCES/0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch @@ -1,4 +1,4 @@ -From e3e393decb5652cee285c2bce010f29e5be9f52e Mon Sep 17 00:00:00 2001 +From 1c75890c8f0ae702abbd880881b57f103f1c94e2 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Thu, 13 Jun 2013 17:50:12 -0400 Subject: [PATCH 3/4] Remove runtime dep on python-pbr, python-d2to1 diff --git a/rpm/SOURCES/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/rpm/SOURCES/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch index 0d5dc2b8d..5adf6aa05 100644 --- a/rpm/SOURCES/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch +++ b/rpm/SOURCES/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch @@ -1,4 +1,4 @@ -From 7160125f84d383bdeea375a9cc7299ce6be2e8be Mon Sep 17 00:00:00 2001 +From 4cb3cf87312a5f351f264f20d7bcd998d2c1f075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Mon, 22 Jul 2013 03:14:27 +0100 Subject: [PATCH 4/4] Revert "Use oslo.sphinx and remove local copy of doc @@ -1198,7 +1198,7 @@ index 0000000..e039fe0 +pygments_style = friendly + diff --git a/doc/source/conf.py b/doc/source/conf.py -index 238a922..58fc367 100644 +index ac2eadc..58fc367 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -33,9 +33,7 @@ extensions = ['sphinx.ext.autodoc', @@ -1206,7 +1206,7 @@ index 238a922..58fc367 100644 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig', - 'sphinx.ext.graphviz', -- 'oslo.sphinx', +- 'oslosphinx', - ] + 'sphinx.ext.graphviz'] @@ -1224,14 +1224,14 @@ index 238a922..58fc367 100644 # 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 15308b9..cabe88a 100644 +index 56746da..cabe88a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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 +-oslosphinx -- 1.7.9.5 diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec index 1d90d1a71..33407da70 100644 --- a/rpm/SPECS/openstack-cinder.spec +++ b/rpm/SPECS/openstack-cinder.spec @@ -2,7 +2,7 @@ Name: openstack-cinder Version: 2014.1 -Release: 0.2.b3%{?dist} +Release: 0.2.rc1%{?dist} Summary: OpenStack Volume service Group: Applications/System -- 2.45.2