# 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: 7.0.3
+Release: 1%{?dist}~mos0
Summary: OpenStack measurement collection service
Group: Applications/System
Source2: %{pypi_name}.logrotate
Source3: %{pypi_name}.conf.sample
Source4: ceilometer-rootwrap-sudoers
-Source5: openstack-ceilometer-polling
-Source10: %{name}-api.service
+Source10: wsgi-ceilometer-api.conf
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
-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: 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-stevedore >= 1.5.0
+Requires: python-jsonpath-rw-ext >= 0.1.9
+Requires: python-stevedore >= 1.9.0
Requires: python-msgpack >= 0.4.0
Requires: python-pbr >= 1.6
Requires: python-six >= 1.9.0
-Requires: python-sqlalchemy >= 0.9.9
+Requires: python-sqlalchemy >= 1.0.10
Requires: python-alembic >= 0.8.0
Requires: python-migrate >= 0.9.6
Requires: python-webob >= 1.2.3
-Requires: python-oslo-config >= 2:2.3.0
+Requires: python-oslo-config >= 2:3.9.0
Requires: PyYAML >= 3.1.0
Requires: python-netaddr >= 0.7.12
Requires: python-oslo-rootwrap >= 2.0.0
Requires: python-oslo-vmware >= 1.16.0
-Requires: python-requests >= 2.5.2
+Requires: python-requests >= 2.8.1
-Requires: pysnmp >= 4.2.1
+Requires: pysnmp >= 4.2.3
Requires: pytz >= 2013.6
Requires: python-croniter >= 0.3.4
Requires: python-werkzeug >= 0.7
Requires: python-oslo-context >= 0.2.0
-Requires: python-oslo-concurrency >= 2.3.0
-Requires: python-oslo-i18n >= 1.5.0
-Requires: python-oslo-log >= 1.8.0
-Requires: python-oslo-middleware >= 2.8.0
+Requires: python-oslo-concurrency >= 3.5.0
+Requires: python-oslo-i18n >= 2.1.0
+Requires: python-oslo-log >= 1.14.0
+Requires: python-oslo-middleware >= 3.0.0
Requires: python-oslo-policy >= 0.5.0
-Requires: python-oslo-service >= 0.7.0
-Requires: python-oslo-reports >= 0.1.0
+Requires: python-oslo-service >= 1.0.0
+Requires: python-oslo-reports >= 0.6.0
+
+Requires: python-futures >= 3.0
+Requires: python-futurist >= 0.11.0
+Requires: python-debtcollector >= 1.2.0
+
+Requires: python-openstackclient
+Requires: python-cotyledon
+Requires: python-influxdb
%description -n python-ceilometer
OpenStack ceilometer provides services to measure and
Group: Applications/System
Requires: python-ceilometer = %{epoch}:%{version}-%{release}
-Requires: python-oslo-messaging >= 1.16.0
-Requires: python-oslo-serialization >= 1.4.0
-Requires: python-oslo-utils >= 2.0.0
+Requires: python-oslo-messaging >= 5.2.0
+Requires: python-oslo-serialization >= 1.10.0
+
+Requires: python-oslo-utils >= 3.5.0
Requires: python-posix_ipc
Requires(post): systemd-units
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-polling = %{epoch}:%{version}-%{release}
-Requires: python-novaclient >= 1:2.28.1
+Requires: python-novaclient >= 1:2.29.0
Requires: python-keystoneclient >= 1:1.6.0
-Requires: python-tooz >= 1.19.0
+Requires: python-keystoneauth1 >= 2.1.0
+Requires: python-tooz >= 1.28.0
Requires: libvirt-python >= 1.2.5
+Requires: libvirt-daemon
%description compute
OpenStack ceilometer provides services to measure and
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-polling = %{epoch}:%{version}-%{release}
-Requires: python-novaclient >= 1:2.28.1
+Requires: python-novaclient >= 1:2.29.0
Requires: python-keystoneclient >= 1:1.6.0
-Requires: python-glanceclient >= 1:0.18.0
+Requires: python-keystoneauth1 >= 2.1.0
+Requires: python-glanceclient >= 1:2.0.0
Requires: python-swiftclient >= 2.2.0
-Requires: python-neutronclient >= 2.6.0
-Requires: python-tooz >= 1.19.0
+Requires: python-neutronclient >= 4.2.0
+Requires: python-tooz >= 1.28.0
%description central
OpenStack ceilometer provides services to measure and
# Remove when all reference the notification package explicitly
Requires: %{name}-notification
-Requires: python-oslo-db >= 2.4.1
+Requires: python-oslo-db >= 4.1.0
Requires: python-pymongo >= 3.0.2
%description collector
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: python-keystonemiddleware >= 2.0.0
-Requires: python-oslo-db >= 2.4.1
+Requires: httpd
+Requires: mod_wsgi
+Requires: python-keystonemiddleware >= 4.0.0
+Requires: python-oslo-db >= 4.1.0
Requires: python-pymongo >= 3.0.2
Requires: python-pecan >= 1.0.0
-Requires: python-wsme >= 0.7
+Requires: python-wsme >= 0.8
Requires: python-paste-deploy >= 1.5.0
-Requires: python-ceilometerclient >= 1.5.0
-Requires: python-tooz >= 1.19.0
+Requires: python-ceilometerclient >= 2.2.1
+Requires: python-tooz >= 1.28.0
%description api
OpenStack ceilometer provides services to measure and
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
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-polling = %{epoch}:%{version}-%{release}
-Requires: python-novaclient >= 1:2.28.1
+Requires: python-novaclient >= 1:2.29.0
Requires: python-keystoneclient >= 1:1.6.0
-Requires: python-neutronclient >= 2.6.0
-Requires: python-tooz >= 1.19.0
+Requires: python-keystoneauth1 >= 2.1.0
+Requires: python-neutronclient >= 4.2.0
+Requires: python-tooz >= 1.28.0
Requires: python-oslo-rootwrap >= 2.0.0
Requires: ipmitool
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: python-novaclient >= 1:2.28.1
+Requires: python-novaclient >= 1:2.29.0
Requires: python-keystoneclient >= 1:1.6.0
-Requires: python-glanceclient >= 1:0.18.0
+Requires: python-keystoneauth1 >= 2.1.0
+Requires: python-glanceclient >= 1:2.0.0
Requires: python-swiftclient >= 2.2.0
+Requires: python-tooz >= 1.28.0
Requires: libvirt-python >= 1.2.5
%description polling
# 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 -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
install -p -D -m 640 %{SOURCE1} %{buildroot}%{_datadir}/ceilometer/ceilometer-dist.conf
install -p -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sudoers.d/ceilometer
-install -p -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/openstack-ceilometer-polling
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/pipeline.yaml %{buildroot}%{_sysconfdir}/ceilometer/pipeline.yaml
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}-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 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}-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
-%endif
+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
+
+# 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
-%post alarm
-%systemd_post %{name}-alarm-notifier.service %{name}-alarm-evaluator.service
-
%post ipmi
%systemd_post %{name}-alarm-ipmi.service
%preun notification
%systemd_preun %{name}-notification.service
-%preun api
-%systemd_preun %{name}-api.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
%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 alarm
-%systemd_postun_with_restart %{name}-alarm-notifier.service %{name}-alarm-evaluator.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-dbsync
+%{_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
%{_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
%files polling
%{_bindir}/ceilometer-polling
-%attr(-, root, ceilometer) %{_sysconfdir}/sysconfig/openstack-ceilometer-polling
%{_unitdir}/%{name}-polling.service
%changelog
+* Tue Mar 28 2017 Ivan Udovichenko <iudovichenko@mirantis.com> - 7.0.3-1.el7~mos0
+- Sync changes. (PROD#9364).
+
+* Mon Mar 13 2017 Ivan Udovichenko <iudovichenko@mirantis.com> - 7.0.2-1.el7~mos0
+- Sync changes. (PROD#9364).
+
+* Tue Feb 07 2017 Ivan Udovichenko <iudovichenko@mirantis.com> - 7.0.1-1.el7~mos0
+- Sync changes. (LP#1659003).
+
+* 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
+
+* Fri May 13 2016 Mikhail Ivanov <mivanov@mirantis.com> - 1:6.0.0-1.el7
+- Update version to 6.0.0
+- Update build and runtime dependencies according to mitaka
+
+* 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