Remove openstack-ceilometer-polling

[openstack-build/ceilometer-build.git] / centos7 / rpm / SPECS / openstack-ceilometer.spec

diff --git a/centos7/rpm/SPECS/openstack-ceilometer.spec b/centos7/rpm/SPECS/openstack-ceilometer.spec
index 626fdf4d6a773a4d48bc2989ebd7085c6a107fe7..21bded4fe641282dc2584d899b8c4958ca10de69 100644 (file)
--- 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:          6.0.0.0rc1
-Release:          1%{?dist}
+Version:          6.0.0
+Release:          2%{?dist}
 Summary:          OpenStack measurement collection service
 
 Group:            Applications/System
@@ -18,7 +18,6 @@ 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
@@ -60,19 +59,19 @@ 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.7.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
 
@@ -81,13 +80,13 @@ 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
 
 %description -n   python-ceilometer
 OpenStack ceilometer provides services to measure and
@@ -101,9 +100,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 >= 4.0.0
+Requires:         python-oslo-serialization >= 1.10.0
+
+Requires:         python-oslo-utils >= 3.5.0
 Requires:         python-posix_ipc
 
 Requires(post):   systemd-units
@@ -128,9 +128,10 @@ 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
 
 %description compute
@@ -148,12 +149,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-tooz >= 1.28.0
 
 %description central
 OpenStack ceilometer provides services to measure and
@@ -172,7 +174,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
@@ -204,14 +206,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
@@ -226,10 +228,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-keystoneauth1 >= 2.1.0
 Requires:         python-neutronclient >= 2.6.0
-Requires:         python-tooz >= 1.19.0
+Requires:         python-tooz >= 1.28.0
 Requires:         python-oslo-rootwrap >= 2.0.0
 Requires:         ipmitool
 
@@ -248,10 +251,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
@@ -341,7 +346,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
@@ -531,11 +535,17 @@ 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:6.0.0-2.el7
+- Remove hardcoded openstack-ceilometer-polling file
+
+* 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)