X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSPECS%2Fopenstack-ceilometer.spec;h=e4c7063a414cc8e52196ae8e10409a23918d487d;hb=36bbde33932c49d59a96394b8d02b0430c6d4431;hp=7998873bf8cf53a5ee2ddcc048ab48a8a66f8dce;hpb=388af890ce100eb16f9ff1af27722099605d8f73;p=openstack-build%2Fceilometer-build.git diff --git a/rpm/SPECS/openstack-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec index 7998873..e4c7063 100644 --- a/rpm/SPECS/openstack-ceilometer.spec +++ b/rpm/SPECS/openstack-ceilometer.spec @@ -3,14 +3,14 @@ %global pypi_name ceilometer Name: openstack-ceilometer -Version: 2013.2 -Release: 1%{?dist} +Version: 2014.1 +Release: 0.6.rc1%{?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 +Source0: http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.rc1.tar.gz Source1: %{pypi_name}-dist.conf Source2: %{pypi_name}.logrotate @@ -26,9 +26,11 @@ Source14: %{name}-alarm-notifier.init Source140: %{name}-alarm-notifier.upstart Source15: %{name}-alarm-evaluator.init Source150: %{name}-alarm-evaluator.upstart +Source16: %{name}-notification.init +Source160: %{name}-notification.upstart # -# patches_base=2013.2 +# patches_base=2014.1.rc1 # Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch @@ -47,7 +49,7 @@ BuildRequires: openstack-utils # These are required to build due to the requirements check added BuildRequires: python-sqlalchemy0.7 -BuildRequires: python-webob >= 1.2 +BuildRequires: python-webob1.2 %description @@ -63,15 +65,16 @@ Requires: python-qpid Requires: python-kombu Requires: python-amqplib +Requires: python-babel Requires: python-eventlet Requires: python-greenlet Requires: python-iso8601 Requires: python-lxml Requires: python-anyjson -Requires: python-stevedore +Requires: python-jsonpath-rw +Requires: python-stevedore >= 0.14 Requires: python-msgpack -Requires: python-netaddr -Requires: python-six +Requires: python-six >= 1.4.1 Requires: PyYAML Requires: python-sqlalchemy0.7 @@ -82,6 +85,11 @@ Requires: python-webob >= 1.2 Requires: python-oslo-config >= 1:1.2.0 +Requires: pysnmp +Requires: pytz +Requires: python-croniter +Requires: python-pecan + %description -n python-ceilometer OpenStack ceilometer provides services to measure and collect metrics from OpenStack components. @@ -120,6 +128,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: python-novaclient Requires: python-keystoneclient Requires: libvirt-python +Requires: python-pecan %description compute OpenStack ceilometer provides services to measure and @@ -170,8 +179,8 @@ Requires: %{name}-common = %{version}-%{release} Requires: python-pymongo Requires: python-flask -Requires: python-pecan -Requires: python-wsme +Requires: python-pecan >= 0.4.5 +Requires: python-wsme >= 0.6 %description api OpenStack ceilometer provides services to measure and @@ -282,6 +291,7 @@ install -p -D -m 755 %{SOURCE12} %{buildroot}%{_initrddir}/%{name}-compute install -p -D -m 755 %{SOURCE13} %{buildroot}%{_initrddir}/%{name}-central install -p -D -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/%{name}-alarm-notifier install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/%{name}-alarm-evaluator +install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/%{name}-notification # Install upstart jobs examples install -d -m 755 %{buildroot}%{_datadir}/ceilometer @@ -291,6 +301,7 @@ install -p -m 644 %{SOURCE120} %{buildroot}%{_datadir}/ceilometer/ install -p -m 644 %{SOURCE130} %{buildroot}%{_datadir}/ceilometer/ install -p -m 644 %{SOURCE140} %{buildroot}%{_datadir}/ceilometer/ install -p -m 644 %{SOURCE150} %{buildroot}%{_datadir}/ceilometer/ +install -p -m 644 %{SOURCE160} %{buildroot}%{_datadir}/ceilometer/ # Install logrotate install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} @@ -356,7 +367,7 @@ fi %preun collector if [ $1 -eq 0 ] ; then - for svc in collector; do + for svc in collector notification; do /sbin/service %{name}-${svc} stop > /dev/null 2>&1 /sbin/chkconfig --del %{name}-${svc} done @@ -397,7 +408,7 @@ fi %postun collector if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall - for svc in collector; do + for svc in collector notification; do /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || : done fi @@ -443,6 +454,7 @@ fi %{_bindir}/ceilometer-dbsync %{_bindir}/ceilometer-expirer +%{_bindir}/ceilometer-send-sample %defattr(-, ceilometer, ceilometer, -) @@ -469,8 +481,11 @@ fi %files collector %{_bindir}/ceilometer-collector* +%{_bindir}/ceilometer-agent-notification %{_initrddir}/%{name}-collector +%{_initrddir}/%{name}-notification %{_datarootdir}/ceilometer/%{name}-collector.upstart +%{_datarootdir}/ceilometer/%{name}-notification.upstart %files api @@ -496,6 +511,27 @@ fi %changelog +* Mon Mar 31 2014 Pádraig Brady 2014.1-0.6.rc1 +- Update to upstream 2014.1.rc1 + +* Fri Mar 14 2014 Pádraig Brady - 2014.1-0.5.b3 +- Update to Icehouse milestone 3 + +* Tue Feb 04 2014 Pádraig Brady - 2014.1-0.4.b2 +- Fix missing dependency on python-babel + +* Mon Jan 27 2014 Pádraig Brady - 2014.1-0.3.b2 +- Update to Icehouse milestone 2 + +* Mon Jan 06 2014 Pádraig Brady - 2014.1-0.2.b1 +- Set python-six min version to ensure updated + +* Mon Dec 23 2013 Pádraig Brady - 2014.1-0.1.b1 +- Update to Icehouse milestone 1 + +* Tue Dec 17 2013 Pádraig Brady - 2013.2.1-1 +- Update to Havana stable release 2013.2.1 + * Thu Oct 17 2013 Pádraig Brady - 2013.2-1 - Update to Havana release