Hello community, here is the log from the commit of package openstack-glance for openSUSE:Factory checked in at 2014-02-11 10:41:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-glance (Old) and /work/SRC/openSUSE:Factory/.openstack-glance.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-glance" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance.changes 2014-01-30 17:43:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance.changes 2014-02-11 10:41:27.000000000 +0100 @@ -1,0 +2,21 @@ +Thu Feb 6 16:12:25 UTC 2014 - [email protected] + +- Fix 0001-RBD-add-now-returns-correct-size-if-given-zero.patch + +------------------------------------------------------------------- +Thu Feb 6 14:48:19 UTC 2014 - [email protected] + +- fix typo in logrotate + +------------------------------------------------------------------- +Sun Feb 2 01:28:31 UTC 2014 - [email protected] + +- Update to version 2013.2.2.dev2.g1a9e0e9: + + Check first matching rule for protected properties + +------------------------------------------------------------------- +Thu Jan 30 15:09:12 UTC 2014 - [email protected] + +- move lock_path to /var/run + +------------------------------------------------------------------- New: ---- openstack-glance.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-glance-doc.spec ++++++ --- /var/tmp/diff_new_pack.DPw5Hj/_old 2014-02-11 10:41:28.000000000 +0100 +++ /var/tmp/diff_new_pack.DPw5Hj/_new 2014-02-11 10:41:28.000000000 +0100 @@ -19,7 +19,7 @@ %define component glance Name: openstack-%{component}-doc -Version: 2013.2.2.dev1.g5cd7a22 +Version: 2013.2.2.dev2.g1a9e0e9 Release: 0 Summary: OpenStack Image Service (Glance) - Documentation License: Apache-2.0 @@ -48,7 +48,7 @@ This package contains documentation files for openstack-glance. %prep -%setup -q -n glance-2013.2.2.dev1.g5cd7a22 +%setup -q -n glance-2013.2.2.dev2.g1a9e0e9 %openstack_cleanup_prep %build ++++++ openstack-glance.spec ++++++ --- /var/tmp/diff_new_pack.DPw5Hj/_old 2014-02-11 10:41:28.000000000 +0100 +++ /var/tmp/diff_new_pack.DPw5Hj/_new 2014-02-11 10:41:28.000000000 +0100 @@ -22,7 +22,7 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 2013.2.2.dev1.g5cd7a22 +Version: 2013.2.2.dev2.g1a9e0e9 Release: 0 Summary: OpenStack Image Service (Glance) License: Apache-2.0 @@ -31,6 +31,10 @@ Source0: glance-stable-havana.tar.gz Source1: openstack-glance.init Source5: %{name}.logrotate +%if 0%{?suse_version} > 1230 +Source10: %name.conf +BuildRequires: systemd +%endif # PATCH-FIX-OPENSUSE: [email protected] -- Don't test qpid functionality, we have no packages Patch2: glance-dont-test-qpid.patch # https://review.openstack.org/#/c/59079/ https://bugs.launchpad.net/glance/+bug/1256044 @@ -139,7 +143,7 @@ of OpenStack Glance. %prep -%setup -q -n glance-2013.2.2.dev1.g5cd7a22 +%setup -q -n glance-2013.2.2.dev2.g1a9e0e9 %patch2 -p1 %patch3 -p1 %openstack_cleanup_prep @@ -159,8 +163,10 @@ install -d -m 755 %{buildroot}%{_localstatedir}/lib/glance install -d -m 755 %{buildroot}%{_localstatedir}/lib/glance/images install -d -m 755 %{buildroot}%{_localstatedir}/log/glance -install -d -m 755 %{buildroot}%{_localstatedir}/lock/glance -install -d -m 755 %{buildroot}%{_localstatedir}/run/glance +install -d -m 700 %{buildroot}%{_localstatedir}/run/%{component} +%if 0%{?suse_version} > 1230 +install -D -m 644 %{SOURCE10} %{buildroot}/%_tmpfilesdir/%name.conf +%endif ### configuration files install -d -m 0755 %{buildroot}%{_sysconfdir}/glance @@ -196,9 +202,9 @@ done #NOTE(saschpe): Needed for (at least) ceilometer to collect image counters stats: crudini --set %{buildroot}%{_sysconfdir}/glance/glance-api.conf DEFAULT notifier_strategy rabbit -crudini --set %{buildroot}%{_sysconfdir}/glance/glance-api.conf DEFAULT lock_path /var/lock/glance +crudini --set %{buildroot}%{_sysconfdir}/glance/glance-api.conf DEFAULT lock_path /var/run/glance crudini --set %{buildroot}%{_sysconfdir}/glance/glance-api.conf keystone_authtoken signing_dir /var/cache/%component/keystone-signing -crudini --set %{buildroot}%{_sysconfdir}/glance/glance-scrubber.conf DEFAULT lock_path /var/lock/glance +crudini --set %{buildroot}%{_sysconfdir}/glance/glance-scrubber.conf DEFAULT lock_path /var/run/glance ### authentication cache dir mkdir -p %{buildroot}%{_localstatedir}/cache/glance/api @@ -237,8 +243,12 @@ %dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/glance %dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/glance/images %dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/log/glance -%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/lock/glance -%ghost %dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/run/glance +%if 0%{?suse_version} > 1230 +%ghost %dir %attr(700,%{username},%{groupname}) %{_localstatedir}/run/%{component} +%_tmpfilesdir/%name.conf +%else +%dir %attr(0700, %{username}, %{groupname}) %{_localstatedir}/run/%{component} +%endif %{_initddir}/openstack-glance-api %{_initddir}/openstack-glance-registry %{_sbindir}/rcopenstack-glance-api ++++++ 0001-RBD-add-now-returns-correct-size-if-given-zero.patch ++++++ --- /var/tmp/diff_new_pack.DPw5Hj/_old 2014-02-11 10:41:28.000000000 +0100 +++ /var/tmp/diff_new_pack.DPw5Hj/_new 2014-02-11 10:41:28.000000000 +0100 @@ -1,23 +1,49 @@ -From 2119227b965eaea5062e544612fd986c51564ace Mon Sep 17 00:00:00 2001 -From: Edward Hope-Morley <[email protected]> -Date: Thu, 28 Nov 2013 17:11:41 +0000 -Subject: [PATCH] RBD add() now returns correct size if given zero - -If the RBD store add() is provided with image_size of zero, it -will calculate based on data provided and return the new size. - -Change-Id: I06375bcfef7808905b466432e5ca100c942297eb -Closes-bug: 1256044 ---- - glance/store/rbd.py | 9 ++++++++- - glance/tests/unit/test_rbd_store.py | 27 +++++++++++++++++++++++---- - 2 files changed, 31 insertions(+), 5 deletions(-) - -diff --git a/glance/store/rbd.py b/glance/store/rbd.py -index c53df5f..ecfd733 100644 ---- a/glance/store/rbd.py -+++ b/glance/store/rbd.py -@@ -327,6 +327,7 @@ class Store(glance.store.base.Store): +diff -ruN a/glance/openstack/common/units.py b/glance/openstack/common/units.py +--- a/glance/openstack/common/units.py 1970-01-01 01:00:00.000000000 +0100 ++++ b/glance/openstack/common/units.py 2014-02-06 17:02:39.229335749 +0100 +@@ -0,0 +1,38 @@ ++# Copyright 2013 IBM Corp ++# All Rights Reserved. ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); you may ++# not use this file except in compliance with the License. You may obtain ++# a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT ++# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the ++# License for the specific language governing permissions and limitations ++# under the License. ++ ++""" ++Unit constants ++""" ++ ++#Binary unit constants. ++Ki = 1024 ++Mi = 1024 ** 2 ++Gi = 1024 ** 3 ++Ti = 1024 ** 4 ++Pi = 1024 ** 5 ++Ei = 1024 ** 6 ++Zi = 1024 ** 7 ++Yi = 1024 ** 8 ++ ++#Decimal unit constants. ++k = 1000 ++M = 1000 ** 2 ++G = 1000 ** 3 ++T = 1000 ** 4 ++P = 1000 ** 5 ++E = 1000 ** 6 ++Z = 1000 ** 7 ++Y = 1000 ** 8 +diff -ruN a/glance/store/rbd.py b/glance/store/rbd.py +--- a/glance/store/rbd.py 2014-02-01 05:53:09.000000000 +0100 ++++ b/glance/store/rbd.py 2014-02-06 17:02:22.113415379 +0100 +@@ -327,6 +327,7 @@ _('RBD image %s already exists') % image_id) try: with rbd.Image(ioctx, image_name) as image: @@ -25,7 +51,7 @@ offset = 0 chunks = utils.chunkreadable(image_file, self.chunk_size) -@@ -336,7 +337,9 @@ class Store(glance.store.base.Store): +@@ -336,7 +337,9 @@ # be slower so setting a higher chunk size may # speed things up a bit. if image_size == 0: @@ -36,7 +62,7 @@ LOG.debug(_("resizing image to %s KiB") % (length / 1024)) image.resize(length) -@@ -356,6 +359,10 @@ class Store(glance.store.base.Store): +@@ -356,6 +359,10 @@ raise exc @@ -47,10 +73,9 @@ return (loc.get_uri(), image_size, checksum.hexdigest(), {}) def delete(self, location): -diff --git a/glance/tests/unit/test_rbd_store.py b/glance/tests/unit/test_rbd_store.py -index 23e055f..7eb799b 100644 ---- a/glance/tests/unit/test_rbd_store.py -+++ b/glance/tests/unit/test_rbd_store.py +diff -ruN a/glance/tests/unit/test_rbd_store.py b/glance/tests/unit/test_rbd_store.py +--- a/glance/tests/unit/test_rbd_store.py 2014-02-01 05:53:10.000000000 +0100 ++++ b/glance/tests/unit/test_rbd_store.py 2014-02-06 17:02:22.113415379 +0100 @@ -14,8 +14,12 @@ # under the License. @@ -64,7 +89,7 @@ import glance.store.rbd as rbd_store from glance.store.location import Location from glance.store.rbd import StoreLocation -@@ -37,6 +41,20 @@ class TestStore(base.StoreClearingUnitTest): +@@ -37,6 +41,20 @@ self.store_specs = {'image': 'fake_image', 'snapshot': 'fake_snapshot'} self.location = StoreLocation(self.store_specs) @@ -85,7 +110,7 @@ def test_add_w_rbd_image_exception(self): def _fake_create_image(*args, **kwargs): -@@ -54,7 +72,7 @@ class TestStore(base.StoreClearingUnitTest): +@@ -54,7 +72,7 @@ self.stubs.Set(mock_rbd.Image, '__enter__', _fake_enter) self.assertRaises(exception.NotFound, self.store.add, @@ -94,7 +119,7 @@ self.called_commands_expected = ['create', 'delete'] -@@ -65,7 +83,7 @@ class TestStore(base.StoreClearingUnitTest): +@@ -65,7 +83,7 @@ self.stubs.Set(self.store, '_create_image', _fake_create_image) self.assertRaises(exception.Duplicate, self.store.add, @@ -103,7 +128,7 @@ self.called_commands_expected = ['create'] def test_delete(self): -@@ -136,9 +154,10 @@ class TestStore(base.StoreClearingUnitTest): +@@ -136,9 +154,10 @@ self.stubs.Set(mock_rbd.Image, 'write', _fake_write) self.stubs.Set(self.store, '_delete_image', _fake_delete_image) @@ -116,6 +141,3 @@ self.called_commands_expected = ['write', 'delete'] --- -1.8.4 - ++++++ glance-stable-havana.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.2.dev1.g5cd7a22/ChangeLog new/glance-2013.2.2.dev2.g1a9e0e9/ChangeLog --- old/glance-2013.2.2.dev1.g5cd7a22/ChangeLog 2013-12-16 13:15:21.000000000 +0100 +++ new/glance-2013.2.2.dev2.g1a9e0e9/ChangeLog 2014-02-01 05:55:58.000000000 +0100 @@ -1,3 +1,22 @@ +commit 1a9e0e94c36127d525c41f03c4223c3e0c2eda03 +Author: Thomas Leaman <[email protected]> +Date: Wed Jan 22 16:02:56 2014 +0000 + + Check first matching rule for protected properties + + When using roles to define protected properties, the first matching rule + in the config file should be used to grant/deny access. This change + enforces that behaviour. + + References bug 1271426 + + Change-Id: Id897085f93bcd143ec443f477f666d4cabd77567 + (Cherry-picked from b6dd538569ebf0f1580c8e1fadc5e0f8054c9b08) + Conflicts: + glance/common/property_utils.py + glance/tests/etc/property-protections.conf + glance/tests/unit/common/test_property_utils.py + commit 5cd7a22b44c3e8acb90bcb0cb7a0d58b3c6a17e9 Author: Alan Pevec <[email protected]> Date: Mon Dec 16 02:55:59 2013 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.2.dev1.g5cd7a22/PKG-INFO new/glance-2013.2.2.dev2.g1a9e0e9/PKG-INFO --- old/glance-2013.2.2.dev1.g5cd7a22/PKG-INFO 2013-12-16 13:15:23.000000000 +0100 +++ new/glance-2013.2.2.dev2.g1a9e0e9/PKG-INFO 2014-02-01 05:55:59.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: glance -Version: 2013.2.2.dev1.g5cd7a22 +Version: 2013.2.2.dev2.g1a9e0e9 Summary: OpenStack Image Service Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.2.dev1.g5cd7a22/glance/common/property_utils.py new/glance-2013.2.2.dev2.g1a9e0e9/glance/common/property_utils.py --- old/glance-2013.2.2.dev1.g5cd7a22/glance/common/property_utils.py 2013-12-16 13:12:39.000000000 +0100 +++ new/glance-2013.2.2.dev2.g1a9e0e9/glance/common/property_utils.py 2014-02-01 05:53:09.000000000 +0100 @@ -99,6 +99,12 @@ for rule_exp, rule in self.rules: if rule_exp.search(str(property_name)): - if set(roles).intersection(set(rule.get(action))): - return True + break + else: # no matching rules + return False + + rule_roles = rule.get(action) + if rule_roles: + if set(roles).intersection(set(rule_roles)): + return True return False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.2.dev1.g5cd7a22/glance/tests/etc/property-protections.conf new/glance-2013.2.2.dev2.g1a9e0e9/glance/tests/etc/property-protections.conf --- old/glance-2013.2.2.dev1.g5cd7a22/glance/tests/etc/property-protections.conf 2013-12-16 13:12:39.000000000 +0100 +++ new/glance-2013.2.2.dev2.g1a9e0e9/glance/tests/etc/property-protections.conf 2014-02-01 05:53:09.000000000 +0100 @@ -40,6 +40,18 @@ update = admin delete = admin,spl_role +[x_foo_matcher] +create = admin +read = admin +update = admin +delete = admin + +[x_foo_*] +create = member +read = member +update = member +delete = member + [.*] create = admin read = admin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.2.dev1.g5cd7a22/glance/tests/unit/common/test_property_utils.py new/glance-2013.2.2.dev2.g1a9e0e9/glance/tests/unit/common/test_property_utils.py --- old/glance-2013.2.2.dev1.g5cd7a22/glance/tests/unit/common/test_property_utils.py 2013-12-16 13:12:39.000000000 +0100 +++ new/glance-2013.2.2.dev2.g1a9e0e9/glance/tests/unit/common/test_property_utils.py 2014-02-01 05:53:10.000000000 +0100 @@ -26,6 +26,8 @@ 'spl_update_prop', 'spl_update_only_prop', 'spl_delete_prop', + 'x_foo_matcher', + 'x_foo_*', '.*' ] @@ -178,3 +180,14 @@ for i in xrange(len(property_utils.CONFIG.sections())): self.assertEqual(property_utils.CONFIG.sections()[i], self.rules_checker.rules[i][0].pattern) + + def test_check_return_first_match(self): + self.rules_checker = property_utils.PropertyRules() + self.assertFalse(self.rules_checker.check_property_rules( + 'x_foo_matcher', 'create', ['member'])) + self.assertFalse(self.rules_checker.check_property_rules( + 'x_foo_matcher', 'read', ['member'])) + self.assertFalse(self.rules_checker.check_property_rules( + 'x_foo_matcher', 'update', ['member'])) + self.assertFalse(self.rules_checker.check_property_rules( + 'x_foo_matcher', 'delete', ['member'])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glance-2013.2.2.dev1.g5cd7a22/glance.egg-info/PKG-INFO new/glance-2013.2.2.dev2.g1a9e0e9/glance.egg-info/PKG-INFO --- old/glance-2013.2.2.dev1.g5cd7a22/glance.egg-info/PKG-INFO 2013-12-16 13:15:22.000000000 +0100 +++ new/glance-2013.2.2.dev2.g1a9e0e9/glance.egg-info/PKG-INFO 2014-02-01 05:55:58.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: glance -Version: 2013.2.2.dev1.g5cd7a22 +Version: 2013.2.2.dev2.g1a9e0e9 Summary: OpenStack Image Service Home-page: http://www.openstack.org/ Author: OpenStack ++++++ openstack-glance.conf ++++++ d /var/run/openstack-glance 0755 openstack-glance openstack-glance - ++++++ openstack-glance.logrotate ++++++ --- /var/tmp/diff_new_pack.DPw5Hj/_old 2014-02-11 10:41:28.000000000 +0100 +++ /var/tmp/diff_new_pack.DPw5Hj/_new 2014-02-11 10:41:28.000000000 +0100 @@ -6,7 +6,7 @@ weekly dateext missingok - notifyempty + notifempty su openstack-glance openstack-glance copytruncate sharedscripts -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
