# Liberty semver reset
# https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z
Epoch: 1
-Version: 5.0.0.0rc1
-Release: 1%{?dist}~mos8.0.1
+Version: 6.0.0.0rc1
+Release: 1%{?dist}
Summary: OpenStack measurement collection service
Group: Applications/System
Source11: %{name}-collector.service
Source12: %{name}-compute.service
Source13: %{name}-central.service
-Source14: %{name}-alarm-notifier.service
-Source15: %{name}-alarm-evaluator.service
-Source16: %{name}-notification.service
-Source17: %{name}-ipmi.service
-Source18: %{name}-polling.service
+Source14: %{name}-notification.service
+Source15: %{name}-ipmi.service
+Source16: %{name}-polling.service
BuildArch: noarch
BuildRequires: intltool
Requires: python-lxml >= 2.3
Requires: python-anyjson >= 0.3.3
Requires: python-jsonpath-rw >= 1.2.0
-Requires: python-jsonpath-rw-ext >= 0.1.7
+Requires: python-jsonpath-rw-ext >= 0.1.9
Requires: python-stevedore >= 1.5.0
Requires: python-msgpack >= 0.4.0
Requires: python-pbr >= 1.6
This package contains the ceilometer API service.
-
-%package alarm
-Summary: OpenStack ceilometer alarm services
-Group: Applications/System
-
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: python-ceilometerclient >= 1.5.0
-
-%description alarm
-OpenStack ceilometer provides services to measure and
-collect metrics from OpenStack components.
-
-This package contains the ceilometer alarm notification
-and evaluation services.
-
-
%package ipmi
Summary: OpenStack ceilometer ipmi agent
Group: Applications/System
install -p -D -m 755 %{SOURCE11} %{buildroot}%{_initrddir}/%{name}-collector
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 -p -D -m 755 %{SOURCE17} %{buildroot}%{_initrddir}/%{name}-ipmi
-install -p -D -m 755 %{SOURCE18} %{buildroot}%{_initrddir}/%{name}-polling
+install -p -D -m 755 %{SOURCE14} %{buildroot}%{_initrddir}/%{name}-notification
+install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/%{name}-ipmi
+install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/%{name}-polling
# Install upstart jobs examples
install -d -m 755 %{buildroot}%{_datadir}/ceilometer
install -p -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}-collector.service
install -p -D -m 644 %{SOURCE12} %{buildroot}%{_unitdir}/%{name}-compute.service
install -p -D -m 644 %{SOURCE13} %{buildroot}%{_unitdir}/%{name}-central.service
-install -p -D -m 644 %{SOURCE14} %{buildroot}%{_unitdir}/%{name}-alarm-notifier.service
-install -p -D -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/%{name}-alarm-evaluator.service
-install -p -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/%{name}-notification.service
-install -p -D -m 644 %{SOURCE17} %{buildroot}%{_unitdir}/%{name}-ipmi.service
-install -p -D -m 644 %{SOURCE18} %{buildroot}%{_unitdir}/%{name}-polling.service
+install -p -D -m 644 %{SOURCE14} %{buildroot}%{_unitdir}/%{name}-notification.service
+install -p -D -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/%{name}-ipmi.service
+install -p -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/%{name}-polling.service
%endif
# Install logrotate
%post central
%systemd_post %{name}-central.service
-%post alarm
-%systemd_post %{name}-alarm-notifier.service %{name}-alarm-evaluator.service
-
%post ipmi
%systemd_post %{name}-alarm-ipmi.service
%preun central
%systemd_preun %{name}-central.service
-%preun alarm
-%systemd_preun %{name}-alarm-notifier.service %{name}-alarm-evaluator.service
-
%preun ipmi
%systemd_preun %{name}-ipmi.service
%postun central
%systemd_postun_with_restart %{name}-central.service
-%postun alarm
-%systemd_postun_with_restart %{name}-alarm-notifier.service %{name}-alarm-evaluator.service
-
%postun ipmi
%systemd_postun_with_restart %{name}-ipmi.service
%files central
%{_unitdir}/%{name}-central.service
-
-%files alarm
-%{_bindir}/ceilometer-alarm-notifier
-%{_bindir}/ceilometer-alarm-evaluator
-%{_unitdir}/%{name}-alarm-notifier.service
-%{_unitdir}/%{name}-alarm-evaluator.service
-
-
%files ipmi
%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/rootwrap.conf
%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/rootwrap.d/ipmi.filters
%changelog
+* Wed Mar 30 2016 Mikhail Ivanov <mivanov@mirantis.com> - 1:6.0.0.0rc1-1.el7
+- Update build and runtime dependencies according to mitaka
+- Remove *-alarm package (now known as aodh package)
+
* Mon Sep 28 2015 Daniil Trishkin <dtrishkin@mirantis.com> - 1:5.0.0.0rc1-1%{?dist}~mos8.0.1
- Update for Liberty
- Update requirements according to global requirements of Liberty