Hello community,
here is the log from the commit of package openstack-cinder for
openSUSE:Factory checked in at 2013-03-08 09:28:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-cinder (Old)
and /work/SRC/openSUSE:Factory/.openstack-cinder.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-cinder", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder.changes
2013-02-23 08:09:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder.changes
2013-03-08 09:28:42.000000000 +0100
@@ -0,0 +1,15 @@
+-------------------------------------------------------------------
+Thu Mar 7 08:29:01 UTC 2013 - vu...@suse.com
+
+- Update cinder-config-update.diff: update etc/cinder/api-paste.ini
+ to have a signing_dir key under [filter:authtoken]. Otherwise,
+ cinder-api won't start. This was done with commit de289a6 in
+ Grizzly.
+
+--------------------------------------------------------------------
+Tue Mar 5 16:53:34 UTC 2013 - cloud-de...@suse.de
+
+- Update to version 2012.2.4+git.1362502414.95a620b:
+ + Check for non-default volume name template.
+ + Fix error for extra specs update with empty body.
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-cinder-doc.spec ++++++
--- /var/tmp/diff_new_pack.86nlNv/_old 2013-03-08 09:28:43.000000000 +0100
+++ /var/tmp/diff_new_pack.86nlNv/_new 2013-03-08 09:28:43.000000000 +0100
@@ -19,7 +19,7 @@
%define component cinder
Name: openstack-%{component}-doc
-Version: 2012.2.4+git.1361527687.68de70d
+Version: 2012.2.4+git.1362502414.95a620b
Release: 1
License: Apache-2.0
Summary: OpenStack Block Storage (Cinder) - Documentation
++++++ openstack-cinder.spec ++++++
--- /var/tmp/diff_new_pack.86nlNv/_old 2013-03-08 09:28:43.000000000 +0100
+++ /var/tmp/diff_new_pack.86nlNv/_new 2013-03-08 09:28:43.000000000 +0100
@@ -21,7 +21,7 @@
%define username openstack-%{component}
Name: openstack-%{component}
-Version: 2012.2.4+git.1361527687.68de70d
+Version: 2012.2.4+git.1362502414.95a620b
Release: 1
License: Apache-2.0
Summary: OpenStack Block Storage (Cinder)
++++++ cinder-config-update.diff ++++++
--- /var/tmp/diff_new_pack.86nlNv/_old 2013-03-08 09:28:43.000000000 +0100
+++ /var/tmp/diff_new_pack.86nlNv/_new 2013-03-08 09:28:43.000000000 +0100
@@ -1,4 +1,6 @@
---- etc/cinder/cinder.conf.sample
+Index: etc/cinder/cinder.conf.sample
+===================================================================
+--- etc/cinder/cinder.conf.sample.orig
+++ etc/cinder/cinder.conf.sample
@@ -65,7 +65,7 @@
# bindir=$pybasedir/bin
@@ -27,3 +29,12 @@
#### (StrOpt) The strategy to use for auth. Supports noauth, keystone, and
#### deprecated.
+Index: etc/cinder/api-paste.ini
+===================================================================
+--- etc/cinder/api-paste.ini.orig
++++ etc/cinder/api-paste.ini
+@@ -49,3 +49,4 @@ auth_protocol = http
+ admin_tenant_name = %SERVICE_TENANT_NAME%
+ admin_user = %SERVICE_USER%
+ admin_password = %SERVICE_PASSWORD%
++signing_dir = /var/lib/cinder
++++++ cinder-stable-folsom.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinder-2012.2.4/ChangeLog
new/cinder-2012.2.4/ChangeLog
--- old/cinder-2012.2.4/ChangeLog 2013-02-20 01:51:09.000000000 +0100
+++ new/cinder-2012.2.4/ChangeLog 2013-02-22 19:12:51.000000000 +0100
@@ -1,3 +1,17 @@
+commit 95a620b9215b937acf73d7248357e1317bc8bca5
+Merge: 0eeca98 95c9f6f
+Author: Jenkins <jenk...@review.openstack.org>
+Date: Fri Feb 22 18:04:57 2013 +0000
+
+ Merge "Fix error for extra specs update with empty body." into
stable/folsom
+
+commit 0eeca986ef19f0b1b6cc5e212606e575a63cf20e
+Merge: 68de70d aeece14
+Author: Jenkins <jenk...@review.openstack.org>
+Date: Fri Feb 22 18:04:55 2013 +0000
+
+ Merge "Check for non-default volume name template." into stable/folsom
+
commit 68de70dd98911d44fc0825cfd9408ddbc7e978a4
Merge: a8caa79 fcf249d
Author: Jenkins <jenk...@review.openstack.org>
@@ -31,6 +45,20 @@
cinder/utils.py | 44 ++++++++++++++++++++
6 files changed, 88 insertions(+), 10 deletions(-)
+commit 95c9f6f5a9fa2e08f5499f23294272d5d95a5568
+Author: Avishay Traeger <avis...@il.ibm.com>
+Date: Mon Jan 21 10:19:02 2013 +0200
+
+ Fix error for extra specs update with empty body.
+
+ Fixes: bug #1090320
+ Change-Id: Ia2792d477f7670ecb2eb0c9c10dcbf1cf5b2389e
+ (cherry picked from commit fee9b2ad61bb69d356e1280f0556afd808c5f128)
+
+ .../openstack/volume/contrib/types_extra_specs.py | 3 ++-
+ .../volume/contrib/test_types_extra_specs.py | 26 ++++++++++----------
+ 2 files changed, 15 insertions(+), 14 deletions(-)
+
commit a8caa79fd93e9837055660904494141251572413
Author: Ollie Leahy <oliver.le...@hp.com>
Date: Tue Jan 29 11:25:27 2013 +0000
@@ -48,6 +76,31 @@
cinder/tests/test_quota.py | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
+commit aeece14ceab7d10acc63742a3dc55eba4f240f63
+Author: John Griffith <john.griff...@solidfire.com>
+Date: Sun Jan 20 22:52:52 2013 +0000
+
+ Check for non-default volume name template.
+
+ The iscsi delete methods in iscsi.py had hard-coded volume names
+ 'volume-%s'.
+
+ If a user configured volume_name_template to
+ something other than default the result is failure to remove
+ the iscsi_target.
+
+ volume create worked appropriately and created the correct name
+ in the DB, so the persistence files were the only thing affected
+ or named incorrectly.
+
+ Fixes bug: 1101071
+
+ Change-Id: Id5575874b2cebd9b3509d739cb92abf06c503c4e
+ (cherry picked from commit f02c575b4b28b69cade6c1c06dd772c62754fc9c)
+
+ cinder/volume/iscsi.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
commit 712f5ce76f8f3d095212df079040d1e60867895e
Author: Mark McLoughlin <mar...@redhat.com>
Date: Thu Jan 31 21:33:47 2013 +0000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinder-2012.2.4/cinder/api/openstack/volume/contrib/types_extra_specs.py
new/cinder-2012.2.4/cinder/api/openstack/volume/contrib/types_extra_specs.py
---
old/cinder-2012.2.4/cinder/api/openstack/volume/contrib/types_extra_specs.py
2013-02-20 01:47:59.000000000 +0100
+++
new/cinder-2012.2.4/cinder/api/openstack/volume/contrib/types_extra_specs.py
2013-02-22 19:09:30.000000000 +0100
@@ -95,7 +95,8 @@
context = req.environ['cinder.context']
authorize(context)
if not body:
- raise webob.exc.HTTPUnprocessableEntity()
+ expl = _('Request body empty')
+ raise webob.exc.HTTPBadRequest(explanation=expl)
self._check_type(context, type_id)
if not id in body:
expl = _('Request body and URI mismatch')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinder-2012.2.4/cinder/tests/api/openstack/volume/contrib/test_types_extra_specs.py
new/cinder-2012.2.4/cinder/tests/api/openstack/volume/contrib/test_types_extra_specs.py
---
old/cinder-2012.2.4/cinder/tests/api/openstack/volume/contrib/test_types_extra_specs.py
2013-02-20 01:47:59.000000000 +0100
+++
new/cinder-2012.2.4/cinder/tests/api/openstack/volume/contrib/test_types_extra_specs.py
2013-02-22 19:09:31.000000000 +0100
@@ -149,6 +149,19 @@
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
req, 1, 'bad', body)
+ def _extra_specs_empty_update(self, body):
+ req = fakes.HTTPRequest.blank('/v2/fake/types/1/extra_specs')
+ req.method = 'POST'
+
+ self.assertRaises(webob.exc.HTTPBadRequest,
+ self.controller.update, req, '1', body)
+
+ def test_update_no_body(self):
+ self._extra_specs_empty_update(body=None)
+
+ def test_update_empty_body(self):
+ self._extra_specs_empty_update(body={})
+
class VolumeTypeExtraSpecsSerializerTest(test.TestCase):
def test_index_create_serializer(self):
@@ -211,16 +224,3 @@
def test_create_malformed_entity(self):
body = {'extra_specs': 'string'}
self._unprocessable_extra_specs_create(body=body)
-
- def _unprocessable_extra_specs_update(self, body):
- req = fakes.HTTPRequest.blank('/v2/fake/types/1/extra_specs')
- req.method = 'POST'
-
- self.assertRaises(webob.exc.HTTPUnprocessableEntity,
- self.controller.update, req, '1', body)
-
- def test_update_no_body(self):
- self._unprocessable_extra_specs_update(body=None)
-
- def test_update_empty_body(self):
- self._unprocessable_extra_specs_update(body={})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinder-2012.2.4/cinder/volume/iscsi.py
new/cinder-2012.2.4/cinder/volume/iscsi.py
--- old/cinder-2012.2.4/cinder/volume/iscsi.py 2013-02-20 01:47:59.000000000
+0100
+++ new/cinder-2012.2.4/cinder/volume/iscsi.py 2013-02-22 19:09:31.000000000
+0100
@@ -40,6 +40,7 @@
FLAGS = flags.FLAGS
FLAGS.register_opts(iscsi_helper_opt)
+FLAGS.import_opt('volume_name_template', 'cinder.db')
class TargetAdmin(object):
@@ -159,7 +160,7 @@
def remove_iscsi_target(self, tid, lun, vol_id, **kwargs):
LOG.info(_('Removing volume: %s') % vol_id)
- vol_uuid_file = 'volume-%s' % vol_id
+ vol_uuid_file = FLAGS.volume_name_template % vol_id
volume_path = os.path.join(FLAGS.volumes_dir, vol_uuid_file)
if os.path.isfile(volume_path):
iqn = '%s%s' % (FLAGS.iscsi_target_prefix,
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
