openstack
/
rpm-packaging
Code Issues Proposed changes

neutron: Create core plugin link and missing dirs 

We use /etc/neutron/plugin.ini in the .service files but the file is
not there. So link it to out default plugin which is ml2.

Also create the default dirs under /var for neutron. Those are needed
to start neutron-server.

Change-Id: I05dd7bd23de41464b520713066d5ecd2e32785b6
This commit is contained in:
Thomas Bechtold 2019-08-30 09:53:39 +02:00
parent ec4230a245
commit 85d1cdef3a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openstack/neutron/neutron.spec.j2
View File

@ -290,6 +290,9 @@ done
%install
%py3_install
# create directories
install -d -m 750 %{buildroot}%{_localstatedir}/{lib,log,cache}/{{ pypi_name }}
# Move rootwrap files to proper location
install -d -m 755 %{buildroot}%{_datarootdir}/{{ pypi_name }}/rootwrap
mv %{buildroot}%{_prefix}%{_sysconfdir}/{{ pypi_name }}/rootwrap.d/*.filters %{buildroot}%{_datarootdir}/{{ pypi_name }}/rootwrap
@ -320,6 +323,9 @@ do
mv etc/{{ pypi_name }}/plugins/ml2/${file}.ini %{buildroot}%{_sysconfdir}/{{ pypi_name }}/plugins/ml2/${file}.ini
done
# default core plugin (the plugin.ini link defines the used plugin. see .service file)
ln -s %{_sysconfdir}/neutron/plugins/ml2/ml2_conf.ini %{buildroot}/%{_sysconfdir}/neutron/plugin.ini
# install modules/modprobe/sysctl
install -D -m 644 %{SOURCE22} %{buildroot}%{_libexecdir}/modules-load.d/openstack-neutron-linuxbridge-agent.conf
install -D -m 644 %{SOURCE22} %{buildroot}%{_libexecdir}/modules-load.d/openstack-neutron-openvswitch-agent.conf
@ -498,6 +504,7 @@ rm neutron/tests/unit/hacking/test_checks.py
%{_unitdir}/openstack-neutron-ovs-cleanup.service
%_tmpfilesdir/%{name}.conf
%attr(-, root, {{ pypi_name }}) %{_sysconfdir}/{{ pypi_name }}/api-paste.ini
%config(noreplace) %{_sysconfdir}/neutron/plugin.ini
%config(noreplace) %attr(0640, root, {{ pypi_name }}) %{_sysconfdir}/{{ pypi_name }}/plugins/ml2/*.ini
%config(noreplace) %attr(0640, root, {{ pypi_name }}) %{_sysconfdir}/{{ pypi_name }}/dhcp_agent.ini
%config(noreplace) %attr(0640, root, {{ pypi_name }}) %{_sysconfdir}/{{ pypi_name }}/l3_agent.ini
@ -515,6 +522,9 @@ rm neutron/tests/unit/hacking/test_checks.py
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%dir %{_datarootdir}/{{ pypi_name }}
%dir %{_datarootdir}/{{ pypi_name }}/rootwrap
%dir %attr(0750, neutron, neutron) %{_localstatedir}/lib/{{ pypi_name }}
%dir %attr(0750, neutron, neutron) %{_localstatedir}/log/{{ pypi_name }}
%dir %attr(0750, neutron, neutron) %{_localstatedir}/cache/{{ pypi_name }}
%{_datarootdir}/{{ pypi_name }}/rootwrap/debug.filters
%{_datarootdir}/{{ pypi_name }}/rootwrap/dhcp.filters
%{_datarootdir}/{{ pypi_name }}/rootwrap/dibbler.filters