openstack
/
rpm-packaging
Code Issues Proposed changes

neutron-{vpnaas,fwaas}: Fix rootwrap filters install path 

Neutron itself does install into /usr/share/neutron/rootwrap so use
the same path for the firewall/vpn services.

Change-Id: Ice5b0af87785ae19c7c869a0be458e4e58dfcee2
This commit is contained in:
Thomas Bechtold 2019-08-30 10:26:34 +02:00
parent ec4230a245
commit 473480cc51
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack/neutron-fwaas/neutron-fwaas.spec.j2
View File

@ -85,15 +85,15 @@ done
install -p -D -m 644 etc/neutron_fwaas.conf.sample %{buildroot}%{_sysconfdir}/neutron/neutron_fwaas.conf
# move wrongly installed files from /usr/etc to /etc
mkdir -p %{buildroot}%{_sysconfdir}/neutron/rootwrap.d/
mv %{buildroot}/%{_prefix}/%{_sysconfdir}/neutron/rootwrap.d/* %{buildroot}%{_sysconfdir}/neutron/rootwrap.d/
install -d -m 755 %{buildroot}%{_datarootdir}/neutron/rootwrap
mv %{buildroot}/%{_prefix}/%{_sysconfdir}/neutron/rootwrap.d/* %{buildroot}%{_datarootdir}/neutron/rootwrap
%files
%license LICENSE
%doc README.rst
%dir %{_sysconfdir}/neutron/rootwrap.d/
%config(noreplace) %{_sysconfdir}/neutron/neutron_fwaas.conf
%config(noreplace) %{_sysconfdir}/neutron/rootwrap.d/fwaas-privsep.filters
%dir %{_datarootdir}/neutron/rootwrap
%{_datarootdir}/neutron/rootwrap/fwaas-privsep.filters
%{_bindir}/neutron-fwaas-migrate-v1-to-v2
%files -n python3-{{ pypi_name }}

8
openstack/neutron-vpnaas/neutron-vpnaas.spec.j2
View File

@ -106,8 +106,8 @@ install -p -D -m 644 etc/neutron_vpnaas.conf.sample %{buildroot}%{_sysconfdir}/n
install -p -D -m 644 etc/vpn_agent.ini.sample %{buildroot}%{_sysconfdir}/neutron/vpn_agent.ini
# move wrongly installed files from /usr/etc to /etc
mkdir -p %{buildroot}%{_sysconfdir}/neutron/rootwrap.d/
mv %{buildroot}/%{_prefix}/%{_sysconfdir}/neutron/rootwrap.d/* %{buildroot}%{_sysconfdir}/neutron/rootwrap.d/
install -d -m 755 %{buildroot}%{_datarootdir}/neutron/rootwrap
mv %{buildroot}/%{_prefix}/%{_sysconfdir}/neutron/rootwrap.d/* %{buildroot}%{_datarootdir}/neutron/rootwrap
### systemd
mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_unitdir}
@ -130,8 +130,8 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcopenstack-neutron-vyatta-age
%doc README.rst
%config(noreplace) %{_sysconfdir}/neutron/neutron_vpnaas.conf
%config(noreplace) %{_sysconfdir}/neutron/vpn_agent.ini
%dir %{_sysconfdir}/neutron/rootwrap.d/
%config %{_sysconfdir}/neutron/rootwrap.d/vpnaas.filters
%dir %{_datarootdir}/neutron/rootwrap
%{_datarootdir}/neutron/rootwrap/vpnaas.filters
%{_bindir}/neutron-vpn-netns-wrapper
%files -n python3-{{ pypi_name }}