From 5ee147ba7582de823e02bde7e822081c23dcfe18 Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Wed, 15 Aug 2018 12:11:54 -0400 Subject: [PATCH] Remove ceilometer controller.yaml from RPM Remove custom controller.yaml from ceilometer RPM as it's useless and will be removed from stx-ceilometer soon. Story: 2003120 Task: 23239 Change-Id: I41682dc2633d8bfb4a8adb297b302f1579a7c33d Signed-off-by: Angie Wang --- .../python-ceilometer/centos/openstack-ceilometer.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/openstack/python-ceilometer/centos/openstack-ceilometer.spec b/openstack/python-ceilometer/centos/openstack-ceilometer.spec index e2797eb9..504b1f61 100644 --- a/openstack/python-ceilometer/centos/openstack-ceilometer.spec +++ b/openstack/python-ceilometer/centos/openstack-ceilometer.spec @@ -396,11 +396,11 @@ done < %{SOURCE1} export PBR_VERSION=%{version} %{__python2} setup.py install -O1 --skip-build --root %{buildroot} -# WRS: Install sql migration cfg and sql files that were not installed by setup.py +# Install sql migration cfg and sql files that were not installed by setup.py install -m 644 ceilometer/storage/sqlalchemy/migrate_repo/migrate.cfg %{buildroot}%{python_sitelib}/ceilometer/storage/sqlalchemy/migrate_repo/migrate.cfg install -m 644 ceilometer/storage/sqlalchemy/migrate_repo/versions/*.sql %{buildroot}%{python_sitelib}/ceilometer/storage/sqlalchemy/migrate_repo/versions/. -# WRS Mitaka. Install non python files that were not installed by setup.py +# Install non python files that were not installed by setup.py install -m 755 -d %{buildroot}%{python_sitelib}/ceilometer/hardware/pollsters/data install -m 644 ceilometer/hardware/pollsters/data/snmp.yaml %{buildroot}%{python_sitelib}/ceilometer/hardware/pollsters/data/snmp.yaml @@ -447,8 +447,6 @@ install -p -D -m 640 etc/ceilometer/rootwrap.conf %{buildroot}%{_sysconfdir}/cei install -p -D -m 640 etc/ceilometer/rootwrap.d/ipmi.filters %{buildroot}/%{_sysconfdir}/ceilometer/rootwrap.d/ipmi.filters install -p -D -m 640 ceilometer/dispatcher/data/gnocchi_resources.yaml %{buildroot}%{_sysconfdir}/ceilometer/gnocchi_resources.yaml install -p -D -m 640 ceilometer/data/meters.d/meters.yaml %{buildroot}%{_sysconfdir}/ceilometer/meters.d/meters.yaml -# WRS -install -p -D -m 640 etc/ceilometer/controller.yaml %{buildroot}%{_sysconfdir}/ceilometer/controller.yaml install -p -D -m 640 ceilometer/api/ceilometer-api.py %{buildroot}%{_datadir}/ceilometer/ceilometer-api.py @@ -613,8 +611,6 @@ exit 0 %config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/api_paste.ini %config(noreplace) %attr(-, root, ceilometer) %{_sysconfdir}/ceilometer/gnocchi_resources.yaml -%{_sysconfdir}/ceilometer/controller.yaml - %dir %attr(0750, ceilometer, root) %{_localstatedir}/log/ceilometer %{_bindir}/ceilometer-db-legacy-clean