X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=centos7%2Frpm%2FSPECS%2Fopenstack-ceilometer.spec;h=936f3f66b7a6fc36691af32d313b2f3f9cf52a61;hb=bc836877ed36af8d6e1cc39b55f88cca0cd7c568;hp=5a9dcbff0ee0d745813dd1a3654bfd0f034ab0d2;hpb=637cf7988c8d39886e93fdaffe894182004ff3d8;p=openstack-build%2Fceilometer-build.git

diff --git a/centos7/rpm/SPECS/openstack-ceilometer.spec b/centos7/rpm/SPECS/openstack-ceilometer.spec
index 5a9dcbf..936f3f6 100644
--- a/centos7/rpm/SPECS/openstack-ceilometer.spec
+++ b/centos7/rpm/SPECS/openstack-ceilometer.spec
@@ -6,8 +6,8 @@ Name:             openstack-ceilometer
 # 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.0~b2
+Release:          1%{?dist}
 Summary:          OpenStack measurement collection service
 
 Group:            Applications/System
@@ -18,17 +18,14 @@ Source1:          %{pypi_name}-dist.conf
 Source2:          %{pypi_name}.logrotate
 Source3:          %{pypi_name}.conf.sample
 Source4:          ceilometer-rootwrap-sudoers
-Source5:          openstack-ceilometer-polling
 
 Source10:         %{name}-api.service
 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
@@ -56,25 +53,25 @@ Requires:         python-iso8601 >= 0.1.9
 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
 
@@ -83,13 +80,21 @@ Requires:         python-jsonschema >= 2.0.0
 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
+
 
 %description -n   python-ceilometer
 OpenStack ceilometer provides services to measure and
@@ -103,9 +108,10 @@ Summary:          Components common to all OpenStack ceilometer services
 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
@@ -130,10 +136,12 @@ 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-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
@@ -150,12 +158,13 @@ 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-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
@@ -174,7 +183,7 @@ Requires:         %{name}-common = %{epoch}:%{version}-%{release}
 # 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
@@ -206,14 +215,14 @@ Group:            Applications/System
 
 Requires:         %{name}-common = %{epoch}:%{version}-%{release}
 
-Requires:         python-keystonemiddleware >= 2.0.0
-Requires:         python-oslo-db >= 2.4.1
+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
@@ -221,22 +230,6 @@ collect metrics from OpenStack components.
 
 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
@@ -244,10 +237,11 @@ 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
 
@@ -266,10 +260,12 @@ Group:            Applications/System
 
 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
@@ -359,7 +355,6 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/sudoers.d
 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
@@ -375,11 +370,9 @@ 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 -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
@@ -397,11 +390,9 @@ 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
+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
@@ -437,9 +428,6 @@ exit 0
 %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
 
@@ -461,9 +449,6 @@ exit 0
 %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
 
@@ -485,9 +470,6 @@ exit 0
 %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
 
@@ -509,6 +491,7 @@ exit 0
 %dir %attr(0755, ceilometer, root) %{_localstatedir}/log/ceilometer
 
 %{_bindir}/ceilometer-dbsync
+%{_bindir}/ceilometer-db-legacy-clean
 %{_bindir}/ceilometer-expirer
 %{_bindir}/ceilometer-send-sample
 
@@ -553,14 +536,6 @@ exit 0
 %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
@@ -570,11 +545,22 @@ exit 0
 
 %files polling
 %{_bindir}/ceilometer-polling
-%attr(-, root, ceilometer) %{_sysconfdir}/sysconfig/openstack-ceilometer-polling
 %{_unitdir}/%{name}-polling.service
 
 
 %changelog
+* 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