%global pypi_name ceilometer
Name: openstack-ceilometer
-Version: 2014.1
-Release: 0.6.rc1%{?dist}
+Version: 2014.1.1
+Release: 2%{?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}.rc1.tar.gz
+Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
Source1: %{pypi_name}-dist.conf
Source2: %{pypi_name}.logrotate
Source16: %{name}-notification.init
Source160: %{name}-notification.upstart
-#
-# patches_base=2014.1.rc1
-#
-Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-
# This is EL6 specific and not upstream
Patch100: openstack-ceilometer-newdeps.patch
BuildRequires: openstack-utils
# These are required to build due to the requirements check added
-BuildRequires: python-sqlalchemy0.7
+BuildRequires: python-sqlalchemy
BuildRequires: python-webob1.2
Requires: python-qpid
Requires: python-kombu
-Requires: python-amqplib
Requires: python-babel
Requires: python-eventlet
Requires: python-jsonpath-rw
Requires: python-stevedore >= 0.14
Requires: python-msgpack
-Requires: python-six >= 1.4.1
+Requires: python-six
Requires: PyYAML
-Requires: python-sqlalchemy0.7
+Requires: python-argparse
+Requires: python-croniter >= 0.3.4
+Requires: python-jsonschema
+Requires: python-lockfile >= 0.8
+Requires: python-netaddr
+Requires: python-pbr
+Requires: python-requests
+
+Requires: python-sqlalchemy >= 0.7.8, python-sqlalchemy < 0.9.5, python-sqlalchemy > 0.9.5, python-sqlalchemy <= 0.9.99
Requires: python-alembic
-Requires: python-migrate
+Requires: python-migrate >= 0.8.2, python-migrate < 0.8.4, python-migrate > 0.8.4
+Requires: python-happybase >= 0.5, python-happybase < 0.7, python-happybase > 0.7
-Requires: python-webob >= 1.2
+Requires: python-webob >= 1.2.3
Requires: python-oslo-config >= 1:1.2.0
+Requires: python-oslo.vmware >= 0.2
Requires: pysnmp
Requires: pytz
Requires: python-croniter
-Requires: python-pecan
+
+# These were only added as global dependencies
+# at the end of the Icehouse cycle with the change
+# to cli.py referenced from in http://pad.lv/1317210
+Requires: python-pymongo
+Requires: python-flask
+Requires: python-pecan >= 0.4.5
+Requires: python-wsme >= 0.6
+Requires: python-novaclient
+Requires: python-keystoneclient
+Requires: python-glanceclient
+Requires: python-swiftclient
+Requires: python-ceilometerclient
+Requires: libvirt-python
%description -n python-ceilometer
OpenStack ceilometer provides services to measure and
Requires: python-novaclient
Requires: python-keystoneclient
Requires: libvirt-python
-Requires: python-pecan
%description compute
OpenStack ceilometer provides services to measure and
%package collector
-Summary: OpenStack ceilometer collector agent
+Summary: OpenStack ceilometer collector
Group: Applications/System
Requires: %{name}-common = %{version}-%{release}
+# For compat with older provisioning tools.
+# Remove when all reference the notification package explicitly
+Requires: %{name}-notification
+
Requires: python-pymongo
%description collector
OpenStack ceilometer provides services to measure and
collect metrics from OpenStack components.
-This package contains the ceilometer collector agent.
+This package contains the ceilometer collector service
+which collects metrics from the various agents.
+
+
+%package notification
+Summary: OpenStack ceilometer notification agent
+Group: Applications/System
+
+Requires: %{name}-common = %{version}-%{release}
+
+%description notification
+OpenStack ceilometer provides services to measure and
+collect metrics from OpenStack components.
+
+This package contains the ceilometer notification agent
+which pushes metrics to the collector service from the
+various OpenStack services.
%package api
# Required to build module documents
BuildRequires: python-eventlet
-BuildRequires: python-sqlalchemy0.7
+BuildRequires: python-sqlalchemy
BuildRequires: python-webob
# while not strictly required, quiets the build down when building docs.
BuildRequires: python-migrate, python-iso8601
%prep
%setup -q -n ceilometer-%{version}
-%patch0001 -p1
-
# Apply EL6 patch
%patch100 -p1
/sbin/chkconfig --add %{name}-collector
fi
+%post notification
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /sbin/chkconfig --add %{name}-notification
+fi
+
%post api
if [ $1 -eq 1 ] ; then
# Initial installation
%preun collector
if [ $1 -eq 0 ] ; then
- for svc in collector notification; do
+ for svc in collector; do
+ /sbin/service %{name}-${svc} stop > /dev/null 2>&1
+ /sbin/chkconfig --del %{name}-${svc}
+ done
+fi
+
+%preun notification
+if [ $1 -eq 0 ] ; then
+ for svc in notification; do
/sbin/service %{name}-${svc} stop > /dev/null 2>&1
/sbin/chkconfig --del %{name}-${svc}
done
%postun collector
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
- for svc in collector notification; do
+ for svc in collector; do
+ /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
+ done
+fi
+
+%postun notification
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ for svc in notification; do
/sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
done
fi
%files collector
%{_bindir}/ceilometer-collector*
-%{_bindir}/ceilometer-agent-notification
%{_initrddir}/%{name}-collector
-%{_initrddir}/%{name}-notification
%{_datarootdir}/ceilometer/%{name}-collector.upstart
+
+
+%files notification
+%{_bindir}/ceilometer-agent-notification
+%{_initrddir}/%{name}-notification
%{_datarootdir}/ceilometer/%{name}-notification.upstart
%changelog
+* Wed Jun 11 2014 Steve Linabery <slinaber@redhat.com> - 2014.1.1-2
+- Update to upstream 2014.1.1
+- fix message routing with newer QPID (rhbz#1103800)
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed May 07 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1-2
+- Avoid dependency issues with distributed installs (#1095414)
+
+* Thu Apr 17 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1-1
+- Update to Icehouse release
+
+* Fri Apr 11 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1-0.7.rc2
+- Update to upstream 2014.1.rc2
+- Remove qpid as default rpc backend
+- Split out openstack-ceilometer-notification subpackage from collector
+
* Mon Mar 31 2014 Pádraig Brady <P@draigBrady.com> 2014.1-0.6.rc1
- Update to upstream 2014.1.rc1
Code Review / openstack-build / ceilometer-build.git / blobdiff