%global pypi_name ceilometer
Name: openstack-ceilometer
-Version: 2013.1.2
-Release: 2%{?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: ceilometer-%{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.2
+# 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
-* Fri Jun 21 2013 Pádraig Brady <P@draigBrady.com> - 2013.1.2-2
-- Avoid qpid exchange leaks
+* 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
+
+* 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