Dan Kenigsberg has uploaded a new change for review. Change subject: modprobe: set bonding max_bonds to 0 ......................................................................
modprobe: set bonding max_bonds to 0 When bonding kernel module is loaded, bond0 is implicitly created. When we create a bonding during installation of the system in Anaconda, it obtains the same name bond0. On the following boot, NM fails because of conflict between NM handled and implicitly created bond. This patch introduces modprobe configuration file for bonding module. With `options bonding max_bonds=0` we disable implicit creation of bondings. Bug-Url: https://bugzilla.redhat.com/1356635 Change-Id: Ic264e8a89eb07b8da42494a9b12ac9c871f78c51 Signed-off-by: Petr Horáček <[email protected]> Reviewed-on: https://gerrit.ovirt.org/61396 Continuous-Integration: Jenkins CI Reviewed-by: Fabian Deutsch <[email protected]> Tested-by: Fabian Deutsch <[email protected]> Tested-by: Edward Haas <[email protected]> Reviewed-by: Dan Kenigsberg <[email protected]> Tested-by: Dan Kenigsberg <[email protected]> (cherry picked from commit 8fd353d5a24eb5e02af00dc5792dfddfb473e76f) --- M vdsm.spec.in M vdsm/Makefile.am A vdsm/vdsm-bonding-modprobe.conf 3 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/93/61593/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index b871d7b..f65e7d4 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -798,6 +798,8 @@ install -Dm 0644 vdsm/vdsm-modules-load.d.conf \ %{buildroot}%{_sysconfdir}/modules-load.d/vdsm.conf +install -Dm 0644 vdsm/vdsm-bonding-modprobe.conf \ + %{buildroot}%{_sysconfdir}/modprobe.d/vdsm-bonding-modprobe.conf install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \ %{buildroot}%{_tmpfilesdir}/%{vdsm_name}.conf install -Dm 0644 init/systemd/unlimited-core.conf \ @@ -941,6 +943,7 @@ %ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/mnt %dir %{_libexecdir}/%{vdsm_name} %dir %{_sysconfdir}/%{vdsm_name}/vdsm.conf.d +%dir %{_sysconfdir}/modprobe.d/ %dir %{_sysconfdir}/NetworkManager %dir %{_sysconfdir}/NetworkManager/conf.d %dir %{_sysconfdir}/%{vdsm_name} @@ -992,6 +995,7 @@ %config(noreplace) %{_sysconfdir}/modules-load.d/vdsm.conf %config(noreplace) %{_tmpfilesdir}/%{vdsm_name}.conf %{_sysconfdir}/dhcp/dhclient.d/sourceRoute.sh +%{_sysconfdir}/modprobe.d/vdsm-bonding-modprobe.conf %{_sysconfdir}/sudoers.d/50_vdsm %{_sysconfdir}/cron.hourly/vdsm-logrotate %{_sysconfdir}/libvirt/hooks/qemu diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index dcd5b4d..1003bdf 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -83,6 +83,7 @@ limits.conf \ logger.conf.in \ mk_sysprep_floppy.in \ + vdsm-bonding-modprobe.conf \ mom.conf.in \ mom.d/00-defines.policy \ mom.d/01-parameters.policy \ @@ -121,6 +122,7 @@ install-data-libvirtpass \ install-data-logger \ install-data-logrotate \ + install-data-modprobe \ install-data-mom \ install-data-networkmanager \ install-data-rwtab \ @@ -150,6 +152,7 @@ uninstall-data-libvirtpass \ uninstall-data-logger \ uninstall-data-logrotate \ + uninstall-data-modprobe \ uninstall-data-mom \ uninstall-data-networkmanager \ uninstall-data-rwtab \ @@ -206,6 +209,14 @@ $(RM) $(DESTDIR)$(vdsmconfdir)/logrotate/vdsm $(RM) $(DESTDIR)$(sysconfdir)/cron.hourly/vdsm-logrotate +install-data-modprobe: + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/modprobe.d + $(INSTALL_DATA) $(srcdir)/vdsm-bonding-modprobe.conf \ + $(DESTDIR)$(sysconfdir)/modprobe.d/vdsm-bonding-modprobe.conf + +uninstall-data-modprobe: + $(RM) $(DESTDIR)$(sysconfdir)/modprobe.d/vdsm-bonding-modprobe.conf + install-data-mom: $(MKDIR_P) $(DESTDIR)$(vdsmconfdir)/mom.d $(INSTALL_DATA) mom.d/*.policy \ diff --git a/vdsm/vdsm-bonding-modprobe.conf b/vdsm/vdsm-bonding-modprobe.conf new file mode 100644 index 0000000..dce5224 --- /dev/null +++ b/vdsm/vdsm-bonding-modprobe.conf @@ -0,0 +1,2 @@ +# VDSM bonding modprobe configuration +options bonding max_bonds=0 -- To view, visit https://gerrit.ovirt.org/61593 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic264e8a89eb07b8da42494a9b12ac9c871f78c51 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Dan Kenigsberg <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/admin/lists/[email protected]
