From: Dmitry Burmistrov Date: Thu, 26 Sep 2013 08:26:49 +0000 (+0400) Subject: Update RPM-specs to 2013.2 version X-Git-Tag: 2014.1~13^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e9b69fab1e9e91746fbb7bb336795904f40768a3;p=openstack-build%2Fceilometer-build.git Update RPM-specs to 2013.2 version Change-Id: I8728c9773d9207fcb0c5c0e448e41a8e0ddb7bdf --- 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 220e998..c6f5653 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 995e4dac63cfaad92a8634211734a81d66f5c688 Mon Sep 17 00:00:00 2001 +From 405a372272ff73c21bf91aedebfe2afb74b83e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Fri, 6 Jan 2012 12:16:34 +0000 Subject: [PATCH] Ensure we don't access the net when building docs @@ -7,18 +7,26 @@ Subject: [PATCH] Ensure we don't access the net when building docs Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2 --- - doc/source/conf.py | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + doc/source/conf.py | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py -index 7b77eb9..2b36df7 100644 +index 9d01807..c89b701 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py -@@ -139,7 +139,6 @@ write_autodoc_index() - # They can be extensions coming with Sphinx (named 'sphinx.ext.*') +@@ -141,7 +141,6 @@ write_autodoc_index() # or your custom ones. - extensions = ['sphinx.ext.autodoc', -- 'sphinx.ext.intersphinx', - 'sphinx.ext.todo', - 'sphinxcontrib.autohttp.flask', - 'wsmeext.sphinxext', + extensions = [ + 'sphinx.ext.autodoc', +- 'sphinx.ext.intersphinx', + 'sphinx.ext.todo', + 'sphinxcontrib.autohttp.flask', + 'wsmeext.sphinxext', +@@ -151,7 +150,6 @@ extensions = [ + 'sphinxcontrib.pecanwsme.rest', + 'oslo.sphinx', + ] +- + wsme_protocols = ['restjson', 'restxml'] + + todo_include_todos = True diff --git a/rpm/SOURCES/0002-avoid-code-path-causing-qpid-exchange-leaks.patch b/rpm/SOURCES/0002-avoid-code-path-causing-qpid-exchange-leaks.patch deleted file mode 100644 index 62c9e3f..0000000 --- a/rpm/SOURCES/0002-avoid-code-path-causing-qpid-exchange-leaks.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 975c75e089327bd63f9fa5c934950244f0daae42 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= -Date: Fri, 21 Jun 2013 10:47:51 +0100 -Subject: [PATCH] avoid code path causing qpid exchange leaks - -Always assume amqp_rpc_single_reply_queue is True, -so that the problematic code path is ignored. -The issue is discussed at https://pad.lv/1178375 ---- - ceilometer/openstack/common/rpc/amqp.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/ceilometer/openstack/common/rpc/amqp.py b/ceilometer/openstack/common/rpc/amqp.py -index d8e6ba0..01f0e1f 100644 ---- a/ceilometer/openstack/common/rpc/amqp.py -+++ b/ceilometer/openstack/common/rpc/amqp.py -@@ -590,7 +590,8 @@ def multicall(conf, context, topic, msg, timeout, connection_pool): - - # TODO(pekowski): Remove this flag and the code under the if clause - # in Havana. -- if not conf.amqp_rpc_single_reply_queue: -+ # (p-draigbrady): This clause is disabled to avoid qpid exchange leaks -+ if False and not conf.amqp_rpc_single_reply_queue: - conn = ConnectionContext(conf, connection_pool) - wait_msg = MulticallWaiter(conf, conn, timeout) - conn.declare_direct_consumer(msg_id, wait_msg) diff --git a/rpm/SOURCES/ceilometer-dist.conf b/rpm/SOURCES/ceilometer-dist.conf new file mode 100644 index 0000000..7757175 --- /dev/null +++ b/rpm/SOURCES/ceilometer-dist.conf @@ -0,0 +1,6 @@ +[DEFAULT] +log_dir = /var/log/ceilometer +rpc_backend = ceilometer.openstack.common.rpc.impl_qpid + +[database] +connection = mysql://ceilometer:ceilometer@localhost/ceilometer diff --git a/rpm/SOURCES/ceilometer.conf b/rpm/SOURCES/ceilometer.conf deleted file mode 100644 index fdf224c..0000000 --- a/rpm/SOURCES/ceilometer.conf +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -logdir = /var/log/ceilometer -sql_connection = mysql://ceilometer:ceilometer@localhost/ceilometer -rpc_backend = ceilometer.openstack.common.rpc.impl_qpid - diff --git a/rpm/SOURCES/openstack-ceilometer-api.init b/rpm/SOURCES/openstack-ceilometer-api.init index 913ae66..731c64c 100644 --- a/rpm/SOURCES/openstack-ceilometer-api.init +++ b/rpm/SOURCES/openstack-ceilometer-api.init @@ -31,7 +31,7 @@ start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " - daemon --user ceilometer --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile" + daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/openstack-ceilometer-api.upstart b/rpm/SOURCES/openstack-ceilometer-api.upstart index 7cde214..56b66eb 100644 --- a/rpm/SOURCES/openstack-ceilometer-api.upstart +++ b/rpm/SOURCES/openstack-ceilometer-api.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/ceilometer-api --config-file /etc/ceilometer/ceilometer.conf --logfile /var/log/ceilometer/api.log" ceilometer +exec su -s /bin/sh -c "exec /usr/bin/ceilometer-api --logfile /var/log/ceilometer/api.log" ceilometer diff --git a/rpm/SOURCES/openstack-ceilometer-central.init b/rpm/SOURCES/openstack-ceilometer-central.init index 366d74a..5d4d1ab 100644 --- a/rpm/SOURCES/openstack-ceilometer-central.init +++ b/rpm/SOURCES/openstack-ceilometer-central.init @@ -31,7 +31,7 @@ start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " - daemon --user ceilometer --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile" + daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/openstack-ceilometer-central.upstart b/rpm/SOURCES/openstack-ceilometer-central.upstart index 390935c..889cda9 100644 --- a/rpm/SOURCES/openstack-ceilometer-central.upstart +++ b/rpm/SOURCES/openstack-ceilometer-central.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/ceilometer-agent-central --config-file /etc/ceilometer/ceilometer.conf --logfile /var/log/ceilometer/central.log" ceilometer +exec su -s /bin/sh -c "exec /usr/bin/ceilometer-agent-central --logfile /var/log/ceilometer/central.log" ceilometer diff --git a/rpm/SOURCES/openstack-ceilometer-collector.init b/rpm/SOURCES/openstack-ceilometer-collector.init index 9dca492..213d51c 100644 --- a/rpm/SOURCES/openstack-ceilometer-collector.init +++ b/rpm/SOURCES/openstack-ceilometer-collector.init @@ -31,7 +31,7 @@ start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " - daemon --user ceilometer --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile" + daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/openstack-ceilometer-collector.upstart b/rpm/SOURCES/openstack-ceilometer-collector.upstart index bd6ee43..eec34bf 100644 --- a/rpm/SOURCES/openstack-ceilometer-collector.upstart +++ b/rpm/SOURCES/openstack-ceilometer-collector.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/ceilometer-collector --config-file /etc/ceilometer/ceilometer.conf --logfile /var/log/ceilometer/collector.log" ceilometer +exec su -s /bin/sh -c "exec /usr/bin/ceilometer-collector --logfile /var/log/ceilometer/collector.log" ceilometer diff --git a/rpm/SOURCES/openstack-ceilometer-compute.init b/rpm/SOURCES/openstack-ceilometer-compute.init index 25e578a..6facfb0 100644 --- a/rpm/SOURCES/openstack-ceilometer-compute.init +++ b/rpm/SOURCES/openstack-ceilometer-compute.init @@ -31,7 +31,7 @@ start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " - daemon --user ceilometer --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile" + daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile diff --git a/rpm/SOURCES/openstack-ceilometer-compute.upstart b/rpm/SOURCES/openstack-ceilometer-compute.upstart index 7d65b2b..2a06de1 100644 --- a/rpm/SOURCES/openstack-ceilometer-compute.upstart +++ b/rpm/SOURCES/openstack-ceilometer-compute.upstart @@ -5,4 +5,4 @@ stop on runlevel [S016] respawn -exec su -s /bin/sh -c "exec /usr/bin/ceilometer-agent-compute --config-file /etc/ceilometer/ceilometer.conf --logfile /var/log/ceilometer/compute.log" ceilometer +exec su -s /bin/sh -c "exec /usr/bin/ceilometer-agent-compute --logfile /var/log/ceilometer/compute.log" ceilometer diff --git a/rpm/SOURCES/openstack-ceilometer-newdeps.patch b/rpm/SOURCES/openstack-ceilometer-newdeps.patch index ae8994f..dc9f441 100644 --- a/rpm/SOURCES/openstack-ceilometer-newdeps.patch +++ b/rpm/SOURCES/openstack-ceilometer-newdeps.patch @@ -1,10 +1,11 @@ -diff -Naur ceilometer-2013.1.g3.orig/ceilometer/__init__.py ceilometer-2013.1.g3/ceilometer/__init__.py ---- ceilometer-2013.1.g3.orig/ceilometer/__init__.py 2013-04-08 09:54:04.545469160 +0000 -+++ ceilometer-2013.1.g3/ceilometer/__init__.py 2013-04-08 10:01:12.306302227 +0000 -@@ -14,6 +14,28 @@ +diff -Naur ceilometer-2013.2.b1.orig/ceilometer/__init__.py ceilometer-2013.2.b1/ceilometer/__init__.py +--- ceilometer-2013.2.b1.orig/ceilometer/__init__.py 2013-05-30 15:09:28.000000000 +0000 ++++ ceilometer-2013.2.b1/ceilometer/__init__.py 2013-05-31 16:05:56.366704819 +0000 +@@ -13,3 +13,25 @@ + # License for the specific language governing permissions and limitations # under the License. # - ++ +import sys +import pkg_resources + @@ -26,13 +27,9 @@ diff -Naur ceilometer-2013.1.g3.orig/ceilometer/__init__.py ceilometer-2013.1.g3 + +replace_dist("WebOb >= 1.2") +replace_dist("SQLAlchemy >= 0.7.3") -+ - import gettext - - gettext.install('ceilometer', unicode=1) -diff -Naur ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py ---- ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py 2013-04-08 09:54:04.608469135 +0000 -+++ ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py 2013-04-08 10:06:21.515180041 +0000 +diff -Naur ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py +--- ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py 2013-05-30 15:09:28.000000000 +0000 ++++ ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py 2013-05-31 16:03:43.209551099 +0000 @@ -52,7 +52,13 @@ diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec index 742c5d7..dd3b5f2 100644 --- a/rpm/SPECS/openstack-ceilometer.spec +++ b/rpm/SPECS/openstack-ceilometer.spec @@ -3,15 +3,15 @@ %global pypi_name ceilometer Name: openstack-ceilometer -Version: 2013.1.3 -Release: 1%{?dist} +Version: 2013.2 +Release: 0.8.b3%{?dist} Summary: OpenStack measurement collection service Group: Applications/System License: ASL 2.0 URL: https://wiki.openstack.org/wiki/Ceilometer -Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.tar.gz -Source1: %{pypi_name}.conf +Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.b3.tar.gz +Source1: %{pypi_name}-dist.conf Source2: %{pypi_name}.logrotate Source10: %{name}-api.init @@ -24,10 +24,9 @@ Source13: %{name}-central.init Source130: %{name}-central.upstart # -# patches_base=2013.1.3 +# patches_base=2013.2.b3 # Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch -Patch0002: 0002-avoid-code-path-causing-qpid-exchange-leaks.patch # This is EL6 specific and not upstream Patch100: openstack-ceilometer-newdeps.patch @@ -36,6 +35,8 @@ BuildArch: noarch BuildRequires: intltool BuildRequires: python-sphinx10 BuildRequires: python-setuptools +BuildRequires: python-pbr +BuildRequires: python-d2to1 BuildRequires: python2-devel BuildRequires: openstack-utils @@ -64,8 +65,12 @@ Requires: python-iso8601 Requires: python-lxml Requires: python-anyjson Requires: python-stevedore +Requires: python-msgpack +Requires: python-netaddr +Requires: python-six Requires: python-sqlalchemy0.7 +Requires: python-alembic Requires: python-migrate Requires: python-webob >= 1.2 @@ -143,7 +148,7 @@ Group: Applications/System Requires: %{name}-common = %{version}-%{release} -Requires: pymongo +Requires: python-pymongo %description collector OpenStack ceilometer provides services to measure and @@ -158,7 +163,7 @@ Group: Applications/System Requires: %{name}-common = %{version}-%{release} -Requires: pymongo +Requires: python-pymongo Requires: python-flask Requires: python-pecan Requires: python-wsme @@ -193,7 +198,6 @@ This package contains documentation files for ceilometer. %setup -q -n ceilometer-%{version} %patch0001 -p1 -%patch0002 -p1 # Apply EL6 patch %patch100 -p1 @@ -205,6 +209,20 @@ find ceilometer -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} + # TODO: Have the following handle multi line entries sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py +# Remove the requirements file so that pbr hooks don't add it +# to distutils requires_dist config +rm -rf {test-,}requirements.txt tools/{pip,test}-requires + +# Programmatically update defaults in sample config +# which is installed at /etc/ceilometer/ceilometer.conf +# TODO: Make this more robust +# Note it only edits the first occurance, so assumes a section ordering in sample +# and also doesn't support multi-valued variables. +while read name eq value; do + test "$name" && test "$value" || continue + sed -i "0,/^# *$name=/{s!^# *$name=.*!#$name=$value!}" etc/ceilometer/ceilometer.conf.sample +done < %{SOURCE1} + %build %{__python} setup.py build @@ -231,7 +249,8 @@ install -d -m 755 %{buildroot}%{_localstatedir}/log/ceilometer # Install config files install -d -m 755 %{buildroot}%{_sysconfdir}/ceilometer -install -p -D -m 640 %{SOURCE1} %{buildroot}%{_sysconfdir}/ceilometer/ceilometer.conf +install -p -D -m 640 %{SOURCE1} %{buildroot}%{_datadir}/ceilometer/ceilometer-dist.conf +install -p -D -m 640 etc/ceilometer/ceilometer.conf.sample %{buildroot}%{_sysconfdir}/ceilometer/ceilometer.conf install -p -D -m 640 etc/ceilometer/policy.json %{buildroot}%{_sysconfdir}/ceilometer/policy.json install -p -D -m 640 etc/ceilometer/sources.json %{buildroot}%{_sysconfdir}/ceilometer/sources.json install -p -D -m 640 etc/ceilometer/pipeline.yaml %{buildroot}%{_sysconfdir}/ceilometer/pipeline.yaml @@ -363,6 +382,7 @@ fi %files common %doc LICENSE %dir %{_sysconfdir}/ceilometer +%attr(-, root, ceilometer) %{_datadir}/ceilometer/ceilometer-dist.conf %config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/ceilometer.conf %config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/policy.json %config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/sources.json @@ -416,18 +436,30 @@ fi %changelog -* Tue Aug 13 2013 Matthias Runge - 2013.1.3-1 -- rebase to 2013.1.3 +* Mon Sep 10 2013 Pádraig Brady - 2013.2-0.8.b3 +- Depend on python-pymongo rather than pymongo to avoid a puppet bug + +* Mon Sep 9 2013 Pádraig Brady - 2013.2-0.7.b3 +- Depend on python-alembic -* Fri Jun 21 2013 Pádraig Brady - 2013.1.2-2 -- Avoid qpid exchange leaks +* Mon Sep 9 2013 Pádraig Brady - 2013.2-0.6.b3 +- Distribute dist defaults in ceilometer-dist.conf separate to user ceilometer.conf -* Thu Jun 6 2013 Pádraig Brady - 2013.1.2-1 -- Update to stable/grizzly release 2013.1.2 +* Mon Sep 9 2013 Pádraig Brady - 2013.2-0.5.b3 +- Update to Havana milestone 3 -* Thu Jun 6 2013 Pádraig Brady - 2013.1-3 +* Tue Aug 27 2013 Pádraig Brady - 2013.2-0.4.b1 +- Avoid python runtime dependency management + +* Sat Aug 03 2013 Fedora Release Engineering - 2013.2-0.3.b1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jun 6 2013 Pádraig Brady - 2013.2-0.2.b1 - Fix uninstall for openstack-ceilometer-central +* Fri May 31 2013 Pádraig Brady - 2013.2-0.1.b1 +- Havana milestone 1 + * Mon Apr 8 2013 Pádraig Brady - 2013.1-2 - Grizzly release