# Liberty semver reset
# https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z
Epoch: 1
-Version: 7.0.0~b2
+Version: 7.0.0
Release: 1%{?dist}
Summary: OpenStack measurement collection service
Source3: %{pypi_name}.conf.sample
Source4: ceilometer-rootwrap-sudoers
-Source10: %{name}-api.service
+Source10: wsgi-ceilometer-api.conf
Source11: %{name}-collector.service
Source12: %{name}-compute.service
Source13: %{name}-central.service
Source14: %{name}-notification.service
Source15: %{name}-ipmi.service
Source16: %{name}-polling.service
+
BuildArch: noarch
BuildRequires: intltool
-BuildRequires: python-sphinx
+BuildRequires: python-sphinx >= 1.1.2
BuildRequires: python-setuptools
-BuildRequires: python-pbr
+BuildRequires: python-pbr >= 1.6
BuildRequires: python-d2to1
BuildRequires: python2-devel
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: httpd
+Requires: mod_wsgi
Requires: python-keystonemiddleware >= 4.0.0
Requires: python-oslo-db >= 4.1.0
Requires: python-pymongo >= 3.0.2
# Required to build module documents
BuildRequires: python-eventlet
-BuildRequires: python-sqlalchemy
-BuildRequires: python-webob
+BuildRequires: python-sqlalchemy >= 1.0.10
+BuildRequires: python-webob >= 1.2.3
# while not strictly required, quiets the build down when building docs.
-BuildRequires: python-migrate, python-iso8601
+BuildRequires: python-migrate >= 0.9.6
+BuildRequires: python-iso8601
%description doc
OpenStack ceilometer provides services to measure and
install -p -D -m 640 etc/ceilometer/api_paste.ini %{buildroot}%{_sysconfdir}/ceilometer/api_paste.ini
install -p -D -m 640 etc/ceilometer/rootwrap.conf %{buildroot}%{_sysconfdir}/ceilometer/rootwrap.conf
install -p -D -m 640 etc/ceilometer/rootwrap.d/ipmi.filters %{buildroot}/%{_sysconfdir}/ceilometer/rootwrap.d/ipmi.filters
+install -p -D -m 640 etc/ceilometer/pipeline.yaml %{buildroot}%{_sysconfdir}/ceilometer/loadbalancer_v2_meter_definitions.yaml
+install -p -D -m 640 etc/ceilometer/examples/osprofiler_event_definitions.yaml %{buildroot}%{_sysconfdir}/ceilometer/osprofiler_event_definitions.yaml
+install -p -D -m 640 etc/ceilometer/gnocchi_resources.yaml %{buildroot}%{_sysconfdir}/ceilometer/gnocchi_resources.yaml
# Install initscripts for services
-%if 0%{?rhel} && 0%{?rhel} <= 6
-install -p -D -m 755 %{SOURCE10} %{buildroot}%{_initrddir}/%{name}-api
-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}-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 -m 644 %{SOURCE100} %{buildroot}%{_datadir}/ceilometer/
-install -p -m 644 %{SOURCE110} %{buildroot}%{_datadir}/ceilometer/
-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 -p -m 644 %{SOURCE170} %{buildroot}%{_datadir}/ceilometer/
-install -p -m 644 %{SOURCE180} %{buildroot}%{_datadir}/ceilometer/
-%else
-install -p -D -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/%{name}-api.service
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}-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 wsgi conf file for ceilometer-api
+install -p -D -m 644 %{SOURCE10} %{buildroot}%{_datadir}/ceilometer/
# Install logrotate
install -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
rm -fr %{buildroot}%{python2_sitelib}/run_tests.*
rm -f %{buildroot}/usr/share/doc/ceilometer/README*
+# Remove file installed to wrong directory
+rm -rf %{buildroot}/etc/ceilometer/osprofiler_event_definitions.yaml
+rm -rf %{buildroot}/usr/etc/ceilometer/api_paste.ini
+rm -rf %{buildroot}/usr/etc/ceilometer/ceilometer-config-generator.conf
+rm -rf %{buildroot}/usr/etc/ceilometer/ceilometer.conf.sample
+rm -rf %{buildroot}/usr/etc/ceilometer/event_definitions.yaml
+rm -rf %{buildroot}/usr/etc/ceilometer/event_pipeline.yaml
+rm -rf %{buildroot}/usr/etc/ceilometer/examples/loadbalancer_v2_meter_definitions.yaml
+rm -rf %{buildroot}/usr/etc/ceilometer/examples/osprofiler_event_definitions.yaml
+rm -rf %{buildroot}/usr/etc/ceilometer/gnocchi_resources.yaml
+rm -rf %{buildroot}/usr/etc/ceilometer/pipeline.yaml
+rm -rf %{buildroot}/usr/etc/ceilometer/policy.json
+rm -rf %{buildroot}/usr/etc/ceilometer/rootwrap.conf
+rm -rf %{buildroot}/usr/etc/ceilometer/rootwrap.d/ipmi.filters
+
%pre common
getent group ceilometer >/dev/null || groupadd -r ceilometer --gid 166
%systemd_post %{name}-notification.service
%post api
-%systemd_post %{name}-api.service
+%systemd_post httpd.service
%post central
%systemd_post %{name}-central.service
%preun notification
%systemd_preun %{name}-notification.service
-%preun api
-%systemd_preun %{name}-api.service
-
%preun central
%systemd_preun %{name}-central.service
%systemd_postun_with_restart %{name}-notification.service
%postun api
-%systemd_postun_with_restart %{name}-api.service
+%systemd_postun_with_restart httpd.service
%postun central
%systemd_postun_with_restart %{name}-central.service
%postun ipmi
%systemd_postun_with_restart %{name}-ipmi.service
-
%postun polling
%systemd_postun_with_restart %{name}-polling.service
%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/pipeline.yaml
%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/api_paste.ini
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/gnocchi_resources.yaml
+%config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/loadbalancer_v2_meter_definitions.yaml
%dir %attr(0755, ceilometer, root) %{_localstatedir}/log/ceilometer
%{_bindir}/ceilometer-db-legacy-clean
%{_bindir}/ceilometer-expirer
%{_bindir}/ceilometer-send-sample
+%{_bindir}/ceilometer-upgrade
%defattr(-, ceilometer, ceilometer, -)
%files api
%{_bindir}/ceilometer-api
-%{_unitdir}/%{name}-api.service
+%attr(0644, root, keystone) %{_datadir}/ceilometer/wsgi-ceilometer-api.conf
%files central
%changelog
+* Wed Nov 2 2016 Andrii Kroshchenko <akroshchenko@mirantis.com> - 1:7.0.0-1.el7
+- Update version to 7.0.0
+- Update build and runtime dependencies
+
* Mon May 30 2016 Mikhail Ivanov <mivanov@mirantis.com> - 1:7.0.0~b2-1.el7
- Remove hardcoded openstack-ceilometer-polling file
LP #1586359