Petr Horáček has uploaded a new change for review.

Change subject: modprobe: set bonding max_bonds to 0
......................................................................

modprobe: set bonding max_bonds to 0

                    |
                    |
                   \ /
                    V

Bug-Url: https://bugzilla.redhat.com/1356635
Change-Id: Ic264e8a89eb07b8da42494a9b12ac9c871f78c51
Signed-off-by: Petr Horáček <[email protected]>
---
M vdsm.spec.in
M vdsm/Makefile.am
A vdsm/modprobe.conf
3 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/61396/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index dba1f33..fd5f5ed 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -779,6 +779,7 @@
                  %{buildroot}%{_tmpfilesdir}/%{vdsm_name}.conf
 install -Dm 0644 init/systemd/unlimited-core.conf \
                  
%{buildroot}%{_sysconfdir}/systemd/system/libvirtd.service.d/unlimited-core.conf
+install -Dm 0644 vdsm/modprobe.conf 
%{buildroot}%{_sysconfdir}/modprobe.d/vdsm.conf
 
 %if 0%{?rhel}
 # This is not commonplace, but we want /var/log/core to be a world-writable
@@ -918,6 +919,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}
@@ -969,6 +971,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.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..dbb4aae 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -83,6 +83,7 @@
        limits.conf \
        logger.conf.in \
        mk_sysprep_floppy.in \
+       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)/modprobe.conf \
+               $(DESTDIR)$(sysconfdir)/modprobe.d/vdsm.conf
+
+uninstall-data-modprobe:
+       $(RM) $(DESTDIR)$(sysconfdir)/modprobe.d/vdsm.conf
+
 install-data-mom:
        $(MKDIR_P) $(DESTDIR)$(vdsmconfdir)/mom.d
        $(INSTALL_DATA) mom.d/*.policy \
diff --git a/vdsm/modprobe.conf b/vdsm/modprobe.conf
new file mode 100644
index 0000000..09861ea
--- /dev/null
+++ b/vdsm/modprobe.conf
@@ -0,0 +1,2 @@
+# VDSM modprobe configuration
+options bonding max_bonds=0


-- 
To view, visit https://gerrit.ovirt.org/61396
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic264e8a89eb07b8da42494a9b12ac9c871f78c51
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <[email protected]>
Gerrit-Reviewer: Dan Kenigsberg <[email protected]>
Gerrit-Reviewer: Edward Haas <[email protected]>
Gerrit-Reviewer: Francesco Romani <[email protected]>
Gerrit-Reviewer: Martin Polednik <[email protected]>
Gerrit-Reviewer: Petr Horáček <[email protected]>
Gerrit-Reviewer: gerrit-hooks <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/admin/lists/[email protected]

Reply via email to