commit openstack-glance for openSUSE:Factory
Hello community,
here is the log from the commit of package openstack-glance for openSUSE:Factory checked in at 2013-04-29 14:09:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-glance (Old)
and /work/SRC/openSUSE:Factory/.openstack-glance.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-glance", Maintainer is "radmanic@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance-doc.changes 2013-01-17 09:52:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance-doc.changes 2013-04-29 14:09:11.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Mar 18 10:40:43 UTC 2013 - speilicke@suse.com
+
+- Drop +git.$TIMESTAMP.$COMMITHASH version suffix
+
+-------------------------------------------------------------------
+Fri Feb 22 10:24:40 UTC 2013 - saschpe@suse.de
+
+- Require openstack-suse-macros instead of openstack-macros
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance.changes 2013-03-25 20:41:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance.changes 2013-04-29 14:09:11.000000000 +0200
@@ -0,0 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 4 16:34:56 UTC 2013 - dmueller@suse.com
+
+- update to grizzly-stable
+
+-------------------------------------------------------------------
+Tue Apr 2 08:39:30 UTC 2013 - speilicke@suse.com
+
+- Update to version 2013.1.rc2
+
@@ -2 +12 @@
-Thu Mar 14 20:23:37 UTC 2013 - vuntz@suse.com
+Tue Mar 26 12:32:36 UTC 2013 - opensuse-cloud@opensuse.org
@@ -4,3 +14 @@
-- Update to version 2012.2.4+git.1363292617.dd849a9:
- + Do not return location in headers (CVE-2013-1840)
-- This fixes bnc#808626.
+- Downgrade to version 2013.1.rc1
@@ -9 +17 @@
-Tue Mar 12 09:06:56 UTC 2013 - vuntz@suse.com
+Mon Mar 25 13:50:43 UTC 2013 - opensuse-cloud@opensuse.org
@@ -11,6 +19,10 @@
-- Update to version 2012.2.4+git.1363079216.04f88c8:
- + Clean dangling image fragments in filesystem store
- + Wait in TestBinGlance.test_update_copying_from until image is active
- + Fixes deletion of invalid image member
-- Drop glance-test_bin_glance-fail-on-slow-machines.patch: fixed
- upstream.
+- Update to version 2013.2.a117.ga3c0a5f:
+ + Handle Swift 404 in scrubber
+ + Don't print sql password in debug messages
+ + Delete swift segments when image_size_cap exceeded
+ + bump version to 2013.2
+
+-------------------------------------------------------------------
+Mon Mar 18 10:40:37 UTC 2013 - speilicke@suse.com
+
+- Drop +git.$TIMESTAMP.$COMMITHASH version suffix
@@ -19 +31 @@
-Wed Mar 6 15:25:21 UTC 2013 - cloud-devel@suse.de
+Sun Mar 17 00:12:19 UTC 2013 - cloud-devel@suse.de
@@ -21,3 +33,30 @@
-- Update to version 2012.2.4+git.1362583521.1fb759d:
- + Swallow UserWarning from glance-cache-manage
- + Avoid dangling partial image on size/checksum mismatch
+- Update to version 2013.1.a110.g975c5ac+git.1363479139.975c5ac:
+ + Fix calls to image_member_find in tests
+ + Retain migration 12 indexes for table image_properties with sqlite.
+ + Fix up publicize_image unit test
+ + Mark password options secret
+ + Fix visibility on db image_member_find
+ + Switch to final 1.1.0 oslo.config release
+ + Honor metadata_encryption_key in glance domain
+ + Publish API version 2.1
+ + Insure that migration 6 retains deleted image property index.
+ + Log when image_size_cap has been exceeded
+ + Fix circular import in glance/db/sqlalchemy
+ + Fix check_003 method.
+ + Declare index on ImageMember model
+ + Fix uniqueness constraint on image_members table.
+ + Do not return location in headers
+ + Segmented images not deleted cleanly from swift.
+ + Document the os options config for swift store
+ + Fix scrubber and other utils to use log.setup().
+ + Fix rabbit_max_retry
+
+-------------------------------------------------------------------
+Fri Mar 15 17:45:26 UTC 2013 - iartarisi@suse.com
+
+- Change ownership of /var/cache/glance to the openstack-glance user
+
+-------------------------------------------------------------------
+Fri Mar 15 15:33:05 UTC 2013 - iartarisi@suse.com
+
+- Move signing_dir to /var/cache/glance/(api|registry)
@@ -26 +65,4 @@
-Tue Mar 5 17:17:04 UTC 2013 - cloud-devel@suse.de
+Wed Mar 13 00:15:32 UTC 2013 - cloud-devel@suse.de
+
+- Update to version 2013.1.a77.ge360117+git.1363133732.e360117:
+ + Characterize image_member_find
@@ -28 +70,31 @@
-- Update to version 2012.2.4+git.1362503824.afe6166:
+-------------------------------------------------------------------
+Tue Mar 12 10:52:35 UTC 2013 - dmueller@suse.com
+
+- python-oslo-config -> python-oslo.config
+
+-------------------------------------------------------------------
+Mon Mar 11 16:08:27 UTC 2013 - dmueller@suse.com
+
+- Add sqlalchemy-update.diff:
+ * Support SQLAlchemy 0.7.10
+
+--------------------------------------------------------------------
+Mon Mar 11 09:58:17 UTC 2013 - cloud-devel@suse.de
+
+- Update to version 2013.1.a76.gdf7d9c7+git.1362995897.df7d9c7:
+ + Refactor leaky abstractions
+ + A test for concurrency when glance uses sleep.
+ + Generate notification for cached v2 download
+ + Update acls in the domain model
+ + Switch to oslo.config.
+ + Remove unused variable 'image_member_factory'
+ + Ensure disk_ and container_format during upload
+ + Fix v2 data upload to swift
+
+--------------------------------------------------------------------
+Tue Mar 5 17:15:47 UTC 2013 - cloud-devel@suse.de
+
+- Update to version 2013.1.a62.g3597718+git.1362503747.3597718:
+ + Pin jsonschema version below 1.0.0.
+ + Fix migration 016 for sqlite.
+ + Refactor data migration tests
@@ -29,0 +102,136 @@
+ + Redact location from notifications
+ + Removed controversial common image property 'os_libosinfo_shortid'
+ + Add migration 021 set_engine_mysql_innodb
+ + Add check for image_locations table
+ + monkey_patch the time module for eventlet
+ + Enable support for MySQL with test migrations.
+ + Remove unused imports
+ + Fix response code for successful image upload.
+ + Parse JSON Schema Draft 10 in v2 Image update
+ + Set status to 'active' after image is uploaded
+ + Add PostgreSQL support to test migrations.
+ + Add pre and check phases to test migration 004
+ + Add pre and check phases to test migration 005
+ + Update db layer to expose multiple image locations
+ + Added better schemas for image members, revised tests.
+ + Test date with UTC instead of local timezone.
+ + v1 api image-list does not return shared images
+ + Cannot change locations on immutable images
+ + Add pre and check phases to test migration 006
+ + Update documentation to reflect API v2 image sharing
+
+-------------------------------------------------------------------
+Mon Feb 25 13:01:49 UTC 2013 - saschpe@suse.de
+
+- Set 'notifier_strategy' configurable to support ceilometer
+
+-------------------------------------------------------------------
+Mon Feb 25 10:06:40 UTC 2013 - saschpe@suse.de
+
+- Drop sysconfig from init scripts
+
+--------------------------------------------------------------------
+Sun Feb 24 18:13:23 UTC 2013 - cloud-devel@suse.de
+
+- Update to version 2013.1.a21.gaa01e82+git.1361729603.aa01e82:
+ + Add migration 18 - create the image_locations table
+ + Use install_venv_common.py from oslo.
+ + Add an update option to run_tests.sh
+ + Create connection for each qpid notification.
+ + Use oslo-config-2013.1b3
+ + Adding new common image properties
+ + Sync latest install_venv_common.py
+ + Filter images by status and add visibility shared
+ + Extend the domain model to v2 image data
+ + Add migration 19 - move image location data
+ + Add migration 20 - drop images.location
+ + Update oslo-config version.
+ + Document db_auto_create in default config files
+ + Remove compat cfg wrapper
+ + Use more-specific value for X-Object-Manifest header.
+ + Fix migration 015 downgrade with sqlite.
+ + Remove unnecessary logging from migration 019
+ + Update openstack.common
+ + Avoid using logging in signal handlers
+
+-------------------------------------------------------------------
+Fri Feb 22 10:24:27 UTC 2013 - saschpe@suse.de
+
+- Require openstack-suse-macros instead of openstack-macros
+
+-------------------------------------------------------------------
+Thu Feb 21 17:11:24 UTC 2013 - iartarisi@suse.com
+
+- Add oslo-config requirement
+
+-------------------------------------------------------------------
+Mon Feb 18 14:15:04 UTC 2013 - saschpe@suse.de
+
+- Init script cleanup:
+ + Drop useless shell variables
+ + Don't depend on $network facility, we already have $remote_fs
+ (comes after $network)
+ + Source /etc/sysconfig/openstack-glance (if available), orthogonal
+ to the other init scripts we provide. We're not using this feature
+ ATM though
+ + Use one init script template for all daemons
+- Default configuration cleanup:
+ + Use openstack-utils to set as much default values in the package
+ as possible (instead of patch/sed/...). Some may be overwritting
+ later on by, .e.g., crowbar
+- More useful lograte configuration:
+ + Compress
++++ 255 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/openstack-glance/openstack-glance.changes
++++ and /work/SRC/openSUSE:Factory/.openstack-glance.new/openstack-glance.changes
Old:
----
glance-lp1083155.patch
glance-run-testsuite-as-root.patch
glance-stable-folsom.tar.gz
glance-webob-requestbodyfileget.patch
glance-webob12b1-putrequest.patch
openstack-glance-api.init
openstack-glance-registry.init
New:
----
glance-stable-grizzly.tar.gz
openstack-glance.init
sqlalchemy-update.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-glance-doc.spec ++++++
--- /var/tmp/diff_new_pack.NDs1Og/_old 2013-04-29 14:09:13.000000000 +0200
+++ /var/tmp/diff_new_pack.NDs1Og/_new 2013-04-29 14:09:13.000000000 +0200
@@ -19,15 +19,15 @@
%define component glance
Name: openstack-%{component}-doc
-Version: 2012.2.4+git.1363292617.dd849a9
-Release: 1
-License: Apache-2.0
+Version: 2013.1.1.a1.g43c5fda
+Release: 0
Summary: OpenStack Image Service (Glance) - Documentation
-Url: https://launchpad.net/glance
+License: Apache-2.0
Group: Documentation/HTML
-Source: glance-stable-folsom.tar.gz
+Url: https://launchpad.net/glance
+Source: glance-stable-grizzly.tar.gz
BuildRequires: graphviz
-BuildRequires: openstack-macros
+BuildRequires: openstack-suse-macros
BuildRequires: python-Sphinx
BuildRequires: python-base
BuildArch: noarch
@@ -47,7 +47,7 @@
This package contains documentation files for openstack-glance.
%prep
-%setup -q -n glance-2012.2.4
+%setup -q -n glance-2013.1.1.a1.g43c5fda
%openstack_cleanup_prep
%build
++++++ openstack-glance.spec ++++++
--- /var/tmp/diff_new_pack.NDs1Og/_old 2013-04-29 14:09:13.000000000 +0200
+++ /var/tmp/diff_new_pack.NDs1Og/_new 2013-04-29 14:09:13.000000000 +0200
@@ -22,38 +22,32 @@
%define username openstack-%{component}
Name: openstack-%{component}
-Version: 2012.2.4+git.1363292617.dd849a9
-Release: 1
-License: Apache-2.0
+Version: 2013.1.1.a1.g43c5fda
+Release: 0
Summary: OpenStack Image Service (Glance)
-Url: https://launchpad.net/glance
+License: Apache-2.0
Group: System/Management
-Source0: glance-stable-folsom.tar.gz
-Source1: openstack-glance-api.init
-Source2: openstack-glance-registry.init
+Url: https://launchpad.net/glance
+Source0: glance-stable-grizzly.tar.gz
+Source1: openstack-glance.init
# WSGI application skeleton for API app (for the SSL proxy):
Source4: openstack-glance-api.wsgi
Source5: %{name}.logrotate
-# PATCH-FIX-UPSTREAM: saschpe@suse.de -- Backport of https://review.openstack.org/#/c/17798/
-Patch0: glance-run-testsuite-as-root.patch
-# PATCH-FIX-UPSTREAM: saschpe@suse.de -- Backport of https://review.openstack.org/#/c/17926/
-Patch2: glance-lp1083155.patch
-# PATCH-FIX-UPSTREAM: saschpe@suse.de -- Backport of https://review.openstack.org/#/c/17932/
-Patch3: glance-webob-requestbodyfileget.patch
-# PATCH-FIX-UPSTREAM: saschpe@suse.de -- Backport of https://review.openstack.org/#/c/18036/
-Patch4: glance-webob12b1-putrequest.patch
-# PATCH-FIX-UPSTREAM: saschpe@suse.de -- Backport of https://review.openstack.org/#/c/19380/
-Patch6: glance-default-signing_dir.patch
+# PATCH-FIX-OPENSUSE: saschpe@suse.de -- #TODO/FIXME: similar to other services
+Patch1: glance-default-signing_dir.patch
+Patch2: sqlalchemy-update.diff
BuildRequires: apache2
BuildRequires: fdupes
-BuildRequires: openstack-macros
+BuildRequires: openstack-suse-macros
+BuildRequires: openstack-utils
BuildRequires: python-base
BuildRequires: python-distribute
# Documentation build requirements:
BuildRequires: python-Sphinx
+Requires: logrotate
Requires: python >= 2.6.8
Requires: python-glance = %{version}
-Requires: logrotate
+Requires: python-oslo.config
# To generate a self-signed certificate to be used in demo setups:
Requires(post): apache2-utils
Requires(post): openssl
@@ -94,19 +88,19 @@
Requires: python-PasteDeploy
Requires: python-SQLAlchemy
Requires: python-WebOb
-Requires: python-anyjson
+Requires: python-anyjson >= 0.2.4
Requires: python-argparse
-Requires: python-boto
-Requires: python-eventlet
+Requires: python-boto >= 2.4.0
+Requires: python-eventlet >= 0.9.12
Requires: python-greenlet
Requires: python-httplib2
Requires: python-iso8601
Requires: python-jsonschema
-Requires: python-kombu
+Requires: python-kombu >= 1.0.4
Requires: python-lxml
Requires: python-passlib
Requires: python-pycrypto
-Requires: python-routes
+Requires: python-routes >= 1.12.3
Requires: python-sqlalchemy-migrate
Requires: python-swiftclient
Requires: python-wsgiref
@@ -120,11 +114,11 @@
Group: Development/Languages/Python
Requires: %{name} = %{version}
Requires: python-coverage
+Requires: python-glanceclient
Requires: python-mox
Requires: python-nose
Requires: python-nose-exclude
Requires: python-nosehtmloutput
-Requires: python-glanceclient
Requires: python-openstack.nose_plugin
Requires: python-pep8
Requires: python-pysendfile
@@ -136,12 +130,9 @@
of OpenStack Glance.
%prep
-%setup -q -n glance-2012.2.4
-%patch0 -p1
+%setup -q -n glance-2013.1.1.a1.g43c5fda
+%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch6 -p1
%openstack_cleanup_prep
sed -i "s|^#!.*||" tools/migrate_image_owners.py # Fix non-executable script warning
# NOTE(saschpe): The following test contains a pesky (commented) race condition
@@ -153,7 +144,7 @@
python setup.py build_sphinx -b man
%install
-python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
### directories
install -d -m 755 %{buildroot}%{_localstatedir}/lib/glance
@@ -170,12 +161,13 @@
install -p -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
### init scripts
-mkdir -p %{buildroot}%{_initddir}
-install -m 755 %{SOURCE1} %{buildroot}%{_initddir}/openstack-glance-api
-install -m 755 %{SOURCE2} %{buildroot}%{_initddir}/openstack-glance-registry
mkdir -p %{buildroot}%{_sbindir}
-ln -s ../..%{_initddir}/openstack-glance-api %{buildroot}%{_sbindir}/rcopenstack-glance-api
-ln -s ../..%{_initddir}/openstack-glance-registry %{buildroot}%{_sbindir}/rcopenstack-glance-registry
+for i in api registry ; do
+ tmp=$(mktemp)
+ cat %{SOURCE1} | sed "s/__NAME__/$i/g" > $tmp
+ install -D -m 755 $tmp %{buildroot}%{_initddir}/%{name}-$i
+ ln -s ../..%{_initddir}/%{name}-$i %{buildroot}%{_sbindir}/rc%{name}-$i
+done
### documentation
install -d %{buildroot}%{_mandir}/man1
@@ -193,12 +185,23 @@
### misc
%fdupes %{buildroot}%{python_sitelib}/%{component}
-# Drop the "glance" binary, there is glanceclient:
-rm %{buildroot}%{_bindir}/glance
+### set default configuration (mostly applies to package-only setups and quickstart, i.e. not generally crowbar)
+for i in api registry ; do
+ openstack-config --set %{buildroot}%{_sysconfdir}/glance/glance-$i.conf DEFAULT verbose True
+ openstack-config --set %{buildroot}%{_sysconfdir}/glance/glance-$i.conf paste_deploy flavor keystone
+ #TODO/FIXME(saschpe): Do we want to use sqlite per default or demand PostgreSQL right away?
+ openstack-config --set %{buildroot}%{_sysconfdir}/glance/glance-$i.conf sql connection sqlite:////var/lib/glance/glance.db
+done
+#NOTE(saschpe): Needed for (at least) ceilometer to colect image counters stats:
+openstack-config --set %{buildroot}%{_sysconfdir}/glance/glance-api.conf DEFAULT notifier_strategy rabbit
+
+### authentication cache dir
+mkdir -p %{buildroot}%{_localstatedir}/cache/glance/api
+mkdir -p %{buildroot}%{_localstatedir}/cache/glance/registry
%pre
getent group %{groupname} >/dev/null || groupadd -r %{groupname}
-getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/glance -s /sbin/nologin -c "OpenStack glance Daemons" %{username}
+getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d %{_localstatedir}/lib/glance -s /sbin/nologin -c "OpenStack Glance Daemons" %{username}
exit 0
%post
@@ -217,13 +220,13 @@
%doc LICENSE README.rst
%dir %{_sysconfdir}/glance
%config(noreplace) %{_sysconfdir}/glance/glance-api.conf
-%config(noreplace) %attr(0600, %{username}, root) %{_sysconfdir}/glance/glance-api-paste.ini
+%config %attr(0600, %{username}, root) %{_sysconfdir}/glance/glance-api-paste.ini
%config(noreplace) %{_sysconfdir}/glance/glance-cache.conf
%config(noreplace) %{_sysconfdir}/glance/glance-registry.conf
-%config(noreplace) %attr(0600, %{username}, root) %{_sysconfdir}/glance/glance-registry-paste.ini
+%config %attr(0600, %{username}, root) %{_sysconfdir}/glance/glance-registry-paste.ini
%config(noreplace) %{_sysconfdir}/glance/glance-scrubber.conf
-%config(noreplace) %{_sysconfdir}/glance/logging.cnf.sample
-%config(noreplace) %{_sysconfdir}/glance/policy.json
+%config %{_sysconfdir}/glance/logging.cnf.sample
+%config %{_sysconfdir}/glance/policy.json
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%dir %attr(0755, %{username}, %{username}) %{_localstatedir}/lib/glance
%dir %attr(0755, %{username}, %{username}) %{_localstatedir}/lib/glance/images
@@ -256,6 +259,7 @@
%openstack_apache_ssl_cert_files
%dir %attr(0755, root, root) %{_localstatedir}/lib/glance/wsgi
%attr(0644, root, root) %{_localstatedir}/lib/glance/wsgi/*.wsgi
+%dir %attr(0755, %{username}, %{username}) %{_localstatedir}/cache/glance
%files -n python-glance
%defattr(-,root,root,-)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.NDs1Og/_old 2013-04-29 14:09:13.000000000 +0200
+++ /var/tmp/diff_new_pack.NDs1Og/_new 2013-04-29 14:09:13.000000000 +0200
@@ -1,6 +1,7 @@
<services>
<service name="git_tarballs" mode="disabled">
- <param name="url">http://tarballs.openstack.org/glance/glance-stable-folsom.tar.gz</param>
- <param name="email">cloud-devel@suse.de</param>
+ <param name="url">http://tarballs.openstack.org/glance/glance-stable-grizzly.tar.gz</param>
+ <param name="email">opensuse-cloud@opensuse.org</param>
+ <param name="plain-version">True</param>
</service>
</services>
++++++ glance-default-signing_dir.patch ++++++
--- /var/tmp/diff_new_pack.NDs1Og/_old 2013-04-29 14:09:13.000000000 +0200
+++ /var/tmp/diff_new_pack.NDs1Og/_new 2013-04-29 14:09:13.000000000 +0200
@@ -1,22 +1,18 @@
-commit fc3a232082a923dcd3e490104500691b1bbd5189
-Author: Sascha Peilicke
participants (1)
-
root@hilbert.suse.de