From 95d0377b474330b0816a9ba9d518f2d08e65d6bd Mon Sep 17 00:00:00 2001 From: Mikhail Ivanov Date: Mon, 30 May 2016 13:06:43 +0300 Subject: [PATCH] Remove openstack-ceilometer-polling Related-Bug:#1586359 Change-Id: I6ff028ff3a9e97ea056c9b08b46413abcc571d85 --- centos7/rpm/SOURCES/openstack-ceilometer-polling | 1 - centos7/rpm/SOURCES/openstack-ceilometer-polling.service | 1 - centos7/rpm/SPECS/openstack-ceilometer.spec | 8 ++++---- 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 centos7/rpm/SOURCES/openstack-ceilometer-polling diff --git a/centos7/rpm/SOURCES/openstack-ceilometer-polling b/centos7/rpm/SOURCES/openstack-ceilometer-polling deleted file mode 100644 index c2fcada..0000000 --- a/centos7/rpm/SOURCES/openstack-ceilometer-polling +++ /dev/null @@ -1 +0,0 @@ -OPTIONS="--polling-namespace 'central' 'compute'" diff --git a/centos7/rpm/SOURCES/openstack-ceilometer-polling.service b/centos7/rpm/SOURCES/openstack-ceilometer-polling.service index d51ef57..24fa86f 100644 --- a/centos7/rpm/SOURCES/openstack-ceilometer-polling.service +++ b/centos7/rpm/SOURCES/openstack-ceilometer-polling.service @@ -5,7 +5,6 @@ After=syslog.target network.target [Service] Type=simple User=ceilometer -EnvironmentFile=/etc/sysconfig/openstack-ceilometer-polling ExecStart=/usr/bin/ceilometer-polling --logfile /var/log/ceilometer/polling.log $OPTIONS [Install] diff --git a/centos7/rpm/SPECS/openstack-ceilometer.spec b/centos7/rpm/SPECS/openstack-ceilometer.spec index 69cd3a2..21bded4 100644 --- a/centos7/rpm/SPECS/openstack-ceilometer.spec +++ b/centos7/rpm/SPECS/openstack-ceilometer.spec @@ -7,7 +7,7 @@ Name: openstack-ceilometer # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z Epoch: 1 Version: 6.0.0 -Release: 1%{?dist} +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 @@ -347,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 @@ -537,11 +535,13 @@ 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 - 1:6.0.0-2.el7 +- Remove hardcoded openstack-ceilometer-polling file + * Fri May 13 2016 Mikhail Ivanov - 1:6.0.0-1.el7 - Update version to 6.0.0 - Update build and runtime dependencies according to mitaka -- 2.32.3