Ema has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357772 )
Change subject: base::kernel: create /etc/modules-load.d
......................................................................
base::kernel: create /etc/modules-load.d
Change-Id: Ia7f050d4a81b8aae2e15256fbeba3b752bd7cbc2
---
M modules/base/manifests/kernel.pp
1 file changed, 9 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/357772/1
diff --git a/modules/base/manifests/kernel.pp b/modules/base/manifests/kernel.pp
index 01c9c76..7281d62 100644
--- a/modules/base/manifests/kernel.pp
+++ b/modules/base/manifests/kernel.pp
@@ -1,20 +1,18 @@
# == Class: base::kernel
#
# Settings related to the Linux kernel (currently only blacklisting
-# risky kernel modules and adding /etc/modules-load.d/ on Trusty)
+# risky kernel modules and adding /etc/modules-load.d/)
#
class base::kernel
{
- if os_version('ubuntu == trusty') {
- # This directory is shipped by systemd, but trusty's upstart job for
- # kmod also parses /etc/modules-load.d/ (but doesn't create the
- # directory).
- file { '/etc/modules-load.d/':
- ensure => 'directory',
- owner => 'root',
- group => 'root',
- mode => '0755',
- }
+ # This directory is shipped by systemd, but trusty's upstart job for
+ # kmod also parses /etc/modules-load.d/ (but doesn't create the
+ # directory).
+ file { '/etc/modules-load.d/':
+ ensure => 'directory',
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
}
file { '/etc/modprobe.d/blacklist-wmf.conf':
--
To view, visit https://gerrit.wikimedia.org/r/357772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7f050d4a81b8aae2e15256fbeba3b752bd7cbc2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
