Hello community,
here is the log from the commit of package openstack-cinder for
openSUSE:Factory checked in at 2013-01-17 09:51:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-cinder (Old)
and /work/SRC/openSUSE:Factory/.openstack-cinder.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-cinder", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2013-01-09 19:40:42.352580873 +0100
+++
/work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder-doc.changes
2013-01-17 09:51:17.000000000 +0100
@@ -0,0 +1,38 @@
+-------------------------------------------------------------------
+Wed Dec 19 15:34:13 UTC 2012 - [email protected]
+
+- It's a noarch package
+
+--------------------------------------------------------------------
+Wed Dec 19 12:23:37 UTC 2012 - [email protected]
+
+- Update to version 2012.2.3+git.1355916217.070c8c9:
+ + Bump next version to 2012.2.3
+ + Bump next version to 2012.2.2
+ + Final versioning for 2012.2.1
+ + Remove unused python-daemon dependency
+ + Improve provider_location cleanup code for RBD.
+ + Detect and fix issues caused by vol ID migration
+ + pin sqlalchemy to the 0.7.x series
+
+-------------------------------------------------------------------
+Fri Nov 23 13:40:12 UTC 2012 - [email protected]
+
+- Add further documentation requirements
+
+-------------------------------------------------------------------
+Thu Nov 15 14:12:01 UTC 2012 - [email protected]
+
+- Use openstack-macros
+- Add additional documentation requirements
+
+-------------------------------------------------------------------
+Thu Nov 8 11:48:46 UTC 2012 - [email protected]
+
+- Drop from_vcs build flag
+
+-------------------------------------------------------------------
+Wed Oct 17 10:57:18 UTC 2012 - [email protected]
+
+- Initial version
+
New Changes file:
--- /dev/null 2013-01-09 19:40:42.352580873 +0100
+++ /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder.changes
2013-01-17 09:51:17.000000000 +0100
@@ -0,0 +1,96 @@
+-------------------------------------------------------------------
+Fri Jan 11 13:46:28 UTC 2013 - [email protected]
+
+- Set a reasonable state_path and rootwrap_dir in /etc/cinder/cinder.conf
+
+-------------------------------------------------------------------
+Fri Jan 11 13:18:48 UTC 2013 - [email protected]
+
+- Drop init-script openstack-cinder-all again, we decided to only
+ ship the individual init scripts to reduce confusion
+
+-------------------------------------------------------------------
+Fri Jan 11 09:23:53 UTC 2013 - [email protected]
+
+- Fix openstack-cinder.init: use --config-file instead of
+ non-existing --flagfile. Also use --log-file instead of
+ --logfile.
+
+-------------------------------------------------------------------
+Thu Jan 10 15:47:01 UTC 2013 - [email protected]
+
+- Add init-script openstack-cinder-all
+
+-------------------------------------------------------------------
+Wed Dec 19 14:45:55 UTC 2012 - [email protected]
+
+- Use macro %openstack_sphinx_build_manpages_only
+
+--------------------------------------------------------------------
+Wed Dec 19 12:23:37 UTC 2012 - [email protected]
+
+- Move to obs-service-git_tarballs
+ + Drop BuildRequires: python-setuptools-git
+- Update to version 2012.2.3+git.1355916217.070c8c9:
+ + Bump next version to 2012.2.3
+ + Bump next version to 2012.2.2
+ + Final versioning for 2012.2.1
+ + Remove unused python-daemon dependency
+ + Improve provider_location cleanup code for RBD.
+ + Detect and fix issues caused by vol ID migration
+ + pin sqlalchemy to the 0.7.x series
+
+-------------------------------------------------------------------
+Wed Dec 5 09:33:13 UTC 2012 - [email protected]
+
+- Use @PARENT_TAG@ in _service file to automate versioning
+
+-------------------------------------------------------------------
+Mon Dec 3 12:30:09 UTC 2012 - [email protected]
+
+- Fix path to cinder/tests/policy.json
+
+-------------------------------------------------------------------
+Mon Dec 3 11:40:13 UTC 2012 - [email protected]
+
+- Add cinder-include-migratecfg.patch: Backport of
+ https://review.openstack.org/17347
+- Move test* files from python-cinder to openstack-cinder-test package
+
+-------------------------------------------------------------------
+Fri Nov 23 13:39:54 UTC 2012 - [email protected]
+
+- Update requirements for python-cinder and openstack-cinder-test
+ packages
+
+-------------------------------------------------------------------
+Thu Nov 15 14:01:51 UTC 2012 - [email protected]
+
+- Use openstack-macros
+
+-------------------------------------------------------------------
+Fri Nov 9 10:20:17 UTC 2012 - [email protected]
+
+- Add more test requirements for which we have packages now:
+ + Requires: python-cliff
+ + Requires: python-nosehtmloutput
+ + Requires: python-nosexcover
+
+-------------------------------------------------------------------
+Thu Nov 8 11:43:10 UTC 2012 - [email protected]
+
+- Drop from_vcs build flag
+
+-------------------------------------------------------------------
+Wed Oct 17 10:40:38 UTC 2012 - [email protected]
+
+- Split out api, scheduler and volume sub-packages:
+ + Added init scripts
+- Add cinder/rootwrap/logrotate default configuration
+- Build and install man-pages (currently only cinder-manage.1)
+
+-------------------------------------------------------------------
+Tue Oct 16 14:28:21 UTC 2012 - [email protected]
+
+- Initial version
+
New:
----
_service
cinder-include-migratecfg.patch
cinder-stable-folsom.tar.gz
openstack-cinder-doc.changes
openstack-cinder-doc.spec
openstack-cinder.changes
openstack-cinder.init
openstack-cinder.logrotate
openstack-cinder.spec
rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-cinder-doc.spec ++++++
#
# spec file for package openstack-cinder-doc
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define component cinder
Name: openstack-%{component}-doc
Version: 2012.2.3+git.1355916217.070c8c9
Release: 0
License: Apache-2.0
Summary: OpenStack Block Storage (Cinder) - Documentation
Url: https://launchpad.net/cinder
Group: Documentation/HTML
Source: cinder-stable-folsom.tar.gz
BuildRequires: graphviz
BuildRequires: openstack-macros
BuildRequires: python-Paste
BuildRequires: python-PasteDeploy
BuildRequires: python-Routes
BuildRequires: python-Sphinx
BuildRequires: python-SQLAlchemy
BuildRequires: python-WebOb
BuildRequires: python-base
BuildRequires: python-cinder = %{version}
BuildRequires: python-cinderclient
BuildRequires: python-distribute
BuildRequires: python-eventlet
BuildRequires: python-feedparser
BuildRequires: python-glanceclient
BuildRequires: python-iso8601
BuildRequires: python-ldap
BuildRequires: python-lxml
BuildRequires: python-mox
BuildRequires: python-paramiko
BuildRequires: python-suds
BuildRequires: python-sqlalchemy-migrate
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Cinder is the OpenStack Block storage service. This is a spin out of
cinder-volumes.
This package contains documentation files for %{name}.
%prep
%setup -q -n cinder-2012.2.3
%openstack_cleanup_prep
%build
python setup.py build_sphinx
rm -rf doc/build/html/.buildinfo # Remove unneeded files
%install
%files
%defattr(-,root,root,-)
%doc LICENSE doc/build/html
%changelog
++++++ openstack-cinder.spec ++++++
#
# spec file for package openstack-cinder
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define component cinder
%define groupname openstack-%{component}
%define username openstack-%{component}
Name: openstack-%{component}
Version: 2012.2.3+git.1355916217.070c8c9
Release: 0
License: Apache-2.0
Summary: OpenStack Block Storage (Cinder)
Url: https://launchpad.net/cinder
Group: System/Management
Source: cinder-stable-folsom.tar.gz
Source1: %{name}.init
Source2: %{name}.logrotate
# PATCH-FIX-UPSTREAM: [email protected] - Backport of
https://review.openstack.org/17347
Patch0: cinder-include-migratecfg.patch
BuildRequires: fdupes
BuildRequires: openstack-macros
BuildRequires: python-base
BuildRequires: python-distribute >= 0.6.24
# Documentation build requirements:
BuildRequires: python-Sphinx
BuildRequires: python-eventlet
BuildRequires: python-WebOb
BuildRequires: python-iso8601
Requires: logrotate
Requires: python >= 2.6.8
Requires: python-cinder = %{version}
%if 0%{?suse_version} > 1110
Requires(pre): pwdutils
%else
Requires(pre): shadow-utils
%endif
%if 0%{?fedora}
Requires(pre): shadow-utils
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
%else
BuildArch: noarch
%endif
%description
Cinder is the OpenStack Block storage service. This is a spin out of
nova-volumes.
%package -n python-cinder
Summary: OpenStack Block Storage (Cinder) - Python module
Group: Development/Languages/Python
Requires: python >= 2.6.8
Requires: python-Paste
Requires: python-PasteDeploy
Requires: python-Routes
Requires: python-SQLAlchemy >= 0.7.3
Requires: python-WebOb
Requires: python-amqplib
Requires: python-anyjson
Requires: python-eventlet >= 0.9.17
Requires: python-glanceclient >= 0.5.0
Requires: python-greenlet >= 0.3.1
Requires: python-iso8601 >= 0.1.4
Requires: python-kombu
Requires: python-lockfile
Requires: python-lxml >= 2.3
Requires: python-paramiko
Requires: python-python-daemon
Requires: python-sqlalchemy-migrate >= 0.7.2
Requires: python-suds
Requires: python-wsgiref
%description -n python-cinder
Cinder is the OpenStack Block storage service. This is a spin out of
nova-volumes.
This package contains the core Python module of OpenStack Keystone.
%package api
Summary: OpenStack Block Storage (Cinder) - API
Group: Development/Languages/Python
Requires: %{name} = %{version}
%description api
This package contains the OpenStack Cinder API.
%package scheduler
Summary: OpenStack Block Storage (Cinder) - Scheduler
Group: Development/Languages/Python
Requires: %{name} = %{version}
%description scheduler
This package contains the OpenStack Cinder scheduler.
%package volume
Summary: OpenStack Block Storage (Cinder) - Volume
Group: Development/Languages/Python
Requires: %{name} = %{version}
%description volume
This package contains the OpenStack Cinder volume manager.
%package test
Summary: OpenStack Block Storage (Cinder) - Testsuite
Group: Development/Languages/Python
Requires: %{name} = %{version}
Requires: git-core >= 1.6.4
Requires: python-pylint
Requires: python-WebTest
Requires: python-coverage
Requires: python-cinderclient
Requires: python-httplib2
Requires: python-ldap
Requires: python-mox
Requires: python-netifaces
Requires: python-nose
Requires: python-nosehtmloutput
Requires: python-nosexcover
Requires: python-openstack.nose_plugin
Requires: python-pep8
Requires: python-python-memcached
Requires: python-unittest2
%description test
The OpenStack Cinder testsuite. It is used to verify the
functionality of OpenStack Cinder.
%prep
%setup -q -n cinder-2012.2.3
%patch0 -p1
%openstack_cleanup_prep
# FIXME: Fix path to test/policy.json due to our special test setup
# maybe the code in cinder/utils.py#find_config could be fixed, too:
# ConfigNotFound: Could not find config at
/usr/lib64/python2.6/site-packages/cinder/tests/cinder/tests/policy.json
sed -i "s|cinder\/tests\/policy.json|policy.json|" ./cinder/tests/fake_flags.py
# NOTE(saschpe): Adjust some config paths:
sed -i -e "s|# rootwrap_config=.*|rootwrap_config=/etc/cinder/rootwrap.conf|" \
-e "s|# state_path=.*|state_path=/var/lib/cinder|"
etc/cinder/cinder.conf.sample
%build
python setup.py build
%openstack_sphinx_build_manpages_only
%install
python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
### directories
install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log}/%{component}
install -d -m 755 %{buildroot}%{_sysconfdir}/%{component}
### configuration files
install -p -D -m 644 etc/cinder/cinder.conf.sample
%{buildroot}%{_sysconfdir}/%{component}/%{component}.conf
install -p -D -m 644 etc/cinder/{api-paste.ini,policy.json,rootwrap.conf}
%{buildroot}%{_sysconfdir}/%{component}/
cp -a etc/cinder/rootwrap.d/ %{buildroot}%{_sysconfdir}/%{component}/
# bash-completion/logrotate/etc.
install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
### init scripts
mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_initddir}
for i in api volume scheduler ; do
tmp=$(mktemp)
cat %{SOURCE1} | sed "s/__NAME__/$i/g" > $tmp
if [ "x$i" = "xcompute" ] ; then
sed -i -e "s/# Should-Start:.*/& libvirtd/" $tmp
fi
install -m 755 $tmp %{buildroot}%{_initddir}/%{name}-$i
ln -s ../..%{_initddir}/%{name}-$i %{buildroot}%{_sbindir}/rc%{name}-$i
done
### documentation
install -d %{buildroot}%{_mandir}/man1
install -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1
### test subpackage
%openstack_test_package_install
%fdupes %{buildroot}%{_localstatedir}/lib/%{name}-test
### misc
%fdupes %{buildroot}%{python_sitelib}/%{component}
%pre
getent group %{groupname} >/dev/null || groupadd -r %{groupname}
getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d
%{_localstatedir}/lib/%{component} -s /sbin/nologin -c "OpenStack Cinder"
%{username}
exit 0
%post api
%{fillup_and_insserv -f %{name}-api}
%preun api
%stop_on_removal %{name}-api
%postun api
%restart_on_update %{name}-api
%insserv_cleanup
%post scheduler
%{fillup_and_insserv -f %{name}-scheduler}
%preun scheduler
%stop_on_removal %{name}-scheduler
%postun scheduler
%restart_on_update %{name}-scheduler
%insserv_cleanup
%post volume
%{fillup_and_insserv -f %{name}-volume}
%preun volume
%stop_on_removal %{name}-volume
%postun volume
%restart_on_update %{name}-volume
%insserv_cleanup
%files
%defattr(-,root,root)
%doc LICENSE README.rst
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%dir %{_sysconfdir}/%{component}
%config(noreplace) %attr(0640, root, %{groupname})
%{_sysconfdir}/%{component}/api-paste.ini
%config(noreplace) %attr(0640, root, %{groupname})
%{_sysconfdir}/%{component}/%{component}.conf
%config(noreplace) %{_sysconfdir}/%{component}/policy.json
%config(noreplace) %{_sysconfdir}/%{component}/rootwrap.conf
%dir %{_sysconfdir}/%{component}/rootwrap.d
%dir %attr(0755, %{username}, root) %{_localstatedir}/lib/%{component}
%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/log/%{component}
%{_bindir}/%{component}-all
%{_bindir}/%{component}-clear-rabbit-queues
%{_bindir}/%{component}-manage
%{_bindir}/%{component}-rootwrap
%{_mandir}/man1/%{component}-manage.1%{?ext_man}
%files -n python-%{component}
%defattr(-,root,root,-)
%doc LICENSE
%{python_sitelib}/%{component}/
%{python_sitelib}/%{component}-*.egg-info
%exclude %{python_sitelib}/%{component}/test*
%files api
%defattr(-,root,root,-)
%doc LICENSE
%{_initddir}/%{name}-api
%{_sbindir}/rc%{name}-api
%{_bindir}/%{component}-api
%files scheduler
%defattr(-,root,root,-)
%doc LICENSE
%{_initddir}/%{name}-scheduler
%{_sbindir}/rc%{name}-scheduler
%{_bindir}/%{component}-scheduler
%files volume
%defattr(-,root,root,-)
%doc LICENSE
%config(noreplace) %{_sysconfdir}/%{component}/rootwrap.d/volume.filters
%{_initddir}/%{name}-volume
%{_sbindir}/rc%{name}-volume
%{_bindir}/%{component}-volume
%{_bindir}/%{component}-volume-usage-audit
%files test
%defattr(-,root,root)
%{_localstatedir}/lib/%{name}-test/
%{python_sitelib}/%{component}/test*
%changelog
++++++ _service ++++++
<services>
<service name="git_tarballs" mode="disabled">
<param
name="url">http://tarballs.openstack.org/cinder/cinder-stable-folsom.tar.gz</param>
<param name="email">[email protected]</param>
</service>
</services>
++++++ cinder-include-migratecfg.patch ++++++
diff -ruN a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in 2012-10-17 12:55:19.327700099 +0200
+++ b/MANIFEST.in 2012-12-03 12:36:05.887213029 +0100
@@ -1,5 +4,9 @@
include AUTHORS
include ChangeLog
+include cinder/db/sqlalchemy/migrate_repo/migrate.cfg
+recursive-include cinder/api/openstack/volume/schemas *.rng
+include cinder/tests/policy.json
+include cinder/tests/test_migrations.conf
exclude .gitignore
exclude .gitreview
++++++ openstack-cinder.init ++++++
#!/bin/sh
### BEGIN INIT INFO
# Provides: openstack-cinder-__NAME__
# Required-Start: $network $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Should-Start: rabbitmq-server mysql postgresql
# Should-Stop: rabbitmq-server mysql postgresql
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: Cinder __NAME__ server
# Description: Cinder __NAME__ server.
### END INIT INFO
name="__NAME__"
USER="openstack-cinder"
GROUP="nobody"
CONFIGFILE="/etc/cinder/cinder.conf"
RUNDIR="/var/run/cinder"
LOGFILE="/var/log/cinder/$name.log"
[ -e "/etc/sysconfig/openstack-cinder-$name" ] && .
"/etc/sysconfig/openstack-cinder-$name"
[ -e $LOGFILE ] || touch $LOGFILE
mkdir -p $RUNDIR
chown $USER. $RUNDIR $LOGFILE
DAEMON_OPTIONS="--config-file=$CONFIGFILE --log-file=$LOGFILE"
OPTIONS="${OPTIONS} $DAEMON_OPTIONS"
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_status check and set local and overall rc status
# rc_status -v be verbose in local rc status and clear it afterwards
# rc_status -v -r ditto and clear both the local and overall rc status
# rc_status -s display "skipped" and exit with status 3
# rc_status -u display "unused" and exit with status 3
# rc_failed set local and overall rc status to failed
# rc_failed <num> set local and overall rc status to <num>
# rc_reset clear both the local and overall rc status
# rc_exit exit appropriate to overall rc status
# rc_active checks whether a service is activated by symlinks
. /etc/rc.status
FULLNAME="OpenStack::Cinder $name server"
CHUSER="-u $USER"
case "$1" in
start)
echo -n "Starting $FULLNAME"
startproc -s $CHUSER -t ${STARTUP_TIMEOUT:-5} -q /usr/bin/cinder-$name
$OPTIONS
rc_status -v
;;
stop)
echo -n "Shutting down $FULLNAME"
killproc /usr/bin/cinder-$name
rc_status -v
;;
restart)
$0 stop
$0 start
rc_status
;;
reload)
;;
status)
echo -n "Checking $FULLNAME"
/sbin/checkproc /usr/bin/cinder-$name
rc_status -v
;;
condrestart|try-restart)
if test "$1" = "condrestart"; then
echo "${attn} Use try-restart ${done}(LSB)${attn} rather than
condrestart ${warn}(RH)${norm}"
fi
$0 status
if test $? = 0; then
$0 restart
else
rc_reset # Not running is not a failure.
fi
rc_status
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}"
exit 2
esac
exit $?
++++++ openstack-cinder.logrotate ++++++
/var/log/cinder/*.log {
daily
missingok
su openstack-cinder openstack-cinder
}
++++++ rpmlintrc ++++++
#TODO: Fix this later on (i.e. SLE-12), Python on SLE-11 is way beyond broken:
addFilter("no-binary")
# This symling is for the -test package and can be ignored:
addFilter("dangling-symlink /var/lib/openstack-cinder-test/cinder")
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
