Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349390 )
Change subject: Revert Load nf_conntrack via /etc/modules-load.d/
......................................................................
Revert Load nf_conntrack via /etc/modules-load.d/
Needs additional fixups for Ubuntu.
Change-Id: Id88c951f79a8941e361fe9571599c162ff08df51
---
M modules/ferm/manifests/init.pp
1 file changed, 0 insertions(+), 15 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index efd1fdf..f26b244 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -11,21 +11,6 @@
source => 'puppet:///modules/base/firewall/nf_conntrack.conf',
}
- # The nf_conntrack kernel module is usually auto-loaded during ferm
startup.
- # But some additional configuration options for timewait handling are
configured
- # via sysctl settings and if ferm autoloads the kernel module after
- # systemd-sysctl.service has run, the sysctl settings are not applied
- # Add the nf_conntrack module via /etc/modules-load.d/ which loads
- # them before systemd-sysctl.service is executed
- file { '/etc/modules-load.d/conntrack.conf':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0444',
- content => "nf_conntrack\n",
- require => File['/etc/modprobe.d/nf_conntrack.conf'],
- }
-
package { ['ferm', 'libnet-dns-perl', 'conntrack']:
ensure => present,
require => File['/etc/modprobe.d/nf_conntrack.conf'],
--
To view, visit https://gerrit.wikimedia.org/r/349390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id88c951f79a8941e361fe9571599c162ff08df51
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
