Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348197 )
Change subject: base::kernel: mod blacklist for Dell R320, blacklist acpi_pad
......................................................................
base::kernel: mod blacklist for Dell R320, blacklist acpi_pad
The acpi_pad kernel module has caused us lots of problems:
(T123924, T141675, T137647, T110202, T159870..)
And the solution was usually to rmmod.
We found a pattern that all the affected servers seem to
be Dell PowerEdge R320 models.
So we want to blacklist this module but not globally, just specifically
for this model.
Add a kernel module blacklist file specific to just Dell R320 servers,
by looking at the "productname" facter value.
Given the existing code this seemed the more straight forward approach vs.
templates and iterating over values.
Using a case statement (with required default) deliberately to add more
models in the future where needed.
Bug: T162850
Change-Id: Iccf5bc967fa7832f2f7a8a9d8faafbe569957c05
---
A modules/base/files/kernel/blacklist-r320.conf
M modules/base/manifests/kernel.pp
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/base/files/kernel/blacklist-r320.conf
b/modules/base/files/kernel/blacklist-r320.conf
new file mode 100644
index 0000000..da8f184
--- /dev/null
+++ b/modules/base/files/kernel/blacklist-r320.conf
@@ -0,0 +1,2 @@
+blacklist acpi_pad
+
diff --git a/modules/base/manifests/kernel.pp b/modules/base/manifests/kernel.pp
index 4a8fec4..e6b76dc 100644
--- a/modules/base/manifests/kernel.pp
+++ b/modules/base/manifests/kernel.pp
@@ -23,6 +23,22 @@
}
}
+ # This section is for blacklisting modules per server model.
+ # It was originally started for acpi_pad issues on R320 (T162850)
+ # but is meant to be extended as needed.
+ case $::productname {
+ 'PowerEdge R320': {
+ file { '/etc/modprobe.d/blacklist-r320.conf':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/base/kernel/blacklist-r320.conf',
+ }
+ }
+ default: {}
+ }
+
# By default trusty allows the creation of user namespaces by unprivileged
users
# (Debian defaulted to disallowing these since the feature was introduced
for security reasons)
# Unprivileged user namespaces are not something we need in general (and
especially
--
To view, visit https://gerrit.wikimedia.org/r/348197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iccf5bc967fa7832f2f7a8a9d8faafbe569957c05
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
