-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?= <pbrady@redhat.com>
Date: Fri, 6 Jan 2012 12:16:34 +0000
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
+++ /dev/null
-From 975c75e089327bd63f9fa5c934950244f0daae42 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
-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)
--- /dev/null
+[DEFAULT]
+log_dir = /var/log/ceilometer
+rpc_backend = ceilometer.openstack.common.rpc.impl_qpid
+
+[database]
+connection = mysql://ceilometer:ceilometer@localhost/ceilometer
+++ /dev/null
-[DEFAULT]
-logdir = /var/log/ceilometer
-sql_connection = mysql://ceilometer:ceilometer@localhost/ceilometer
-rpc_backend = ceilometer.openstack.common.rpc.impl_qpid
-
[ -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
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
[ -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
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
[ -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
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
[ -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
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 -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
+
+
+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 @@
%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
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
BuildRequires: intltool
BuildRequires: python-sphinx10
BuildRequires: python-setuptools
+BuildRequires: python-pbr
+BuildRequires: python-d2to1
BuildRequires: python2-devel
BuildRequires: openstack-utils
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
Requires: %{name}-common = %{version}-%{release}
-Requires: pymongo
+Requires: python-pymongo
%description collector
OpenStack ceilometer provides services to measure and
Requires: %{name}-common = %{version}-%{release}
-Requires: pymongo
+Requires: python-pymongo
Requires: python-flask
Requires: python-pecan
Requires: python-wsme
%setup -q -n ceilometer-%{version}
%patch0001 -p1
-%patch0002 -p1
# Apply EL6 patch
%patch100 -p1
# 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
# 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
%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
%changelog
-* Tue Aug 13 2013 Matthias Runge <mrunge@redhat.com> - 2013.1.3-1
-- rebase to 2013.1.3
+* Mon Sep 10 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2-0.8.b3
+- Depend on python-pymongo rather than pymongo to avoid a puppet bug
+
+* Mon Sep 9 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2-0.7.b3
+- Depend on python-alembic
-* Fri Jun 21 2013 Pádraig Brady <P@draigBrady.com> - 2013.1.2-2
-- Avoid qpid exchange leaks
+* Mon Sep 9 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2-0.6.b3
+- Distribute dist defaults in ceilometer-dist.conf separate to user ceilometer.conf
-* Thu Jun 6 2013 Pádraig Brady <P@draigBrady.com> - 2013.1.2-1
-- Update to stable/grizzly release 2013.1.2
+* Mon Sep 9 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2-0.5.b3
+- Update to Havana milestone 3
-* Thu Jun 6 2013 Pádraig Brady <P@draigBrady.com> - 2013.1-3
+* Tue Aug 27 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2-0.4.b1
+- Avoid python runtime dependency management
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2013.2-0.3.b1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Jun 6 2013 Pádraig Brady <P@draigBrady.com> - 2013.2-0.2.b1
- Fix uninstall for openstack-ceilometer-central
+* Fri May 31 2013 Pádraig Brady <P@draigBrady.com> - 2013.2-0.1.b1
+- Havana milestone 1
+
* Mon Apr 8 2013 Pádraig Brady <P@draigBrady.com> - 2013.1-2
- Grizzly release
Code Review / openstack-build / ceilometer-build.git / commitdiff