From 473480cc519a204359e54695740d0441db4884b1 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Fri, 30 Aug 2019 10:26:34 +0200 Subject: [PATCH] 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 --- openstack/neutron-fwaas/neutron-fwaas.spec.j2 | 8 ++++---- openstack/neutron-vpnaas/neutron-vpnaas.spec.j2 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openstack/neutron-fwaas/neutron-fwaas.spec.j2 b/openstack/neutron-fwaas/neutron-fwaas.spec.j2 index dddb6ed94..94daa0f1d 100644 --- a/openstack/neutron-fwaas/neutron-fwaas.spec.j2 +++ b/openstack/neutron-fwaas/neutron-fwaas.spec.j2 @@ -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 }} diff --git a/openstack/neutron-vpnaas/neutron-vpnaas.spec.j2 b/openstack/neutron-vpnaas/neutron-vpnaas.spec.j2 index 5188256d3..80e711915 100644 --- a/openstack/neutron-vpnaas/neutron-vpnaas.spec.j2 +++ b/openstack/neutron-vpnaas/neutron-vpnaas.spec.j2 @@ -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 }}