Faidon Liambotis has submitted this change and it was merged.
Change subject: cpufrequtils: move Ubuntu stupidity under if guard
......................................................................
cpufrequtils: move Ubuntu stupidity under if guard
Change-Id: I24ce0a31221418c90d71337265b1d6468637ca01
---
M modules/cpufrequtils/manifests/init.pp
1 file changed, 6 insertions(+), 10 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/cpufrequtils/manifests/init.pp
b/modules/cpufrequtils/manifests/init.pp
index 9dc931a..62409f8 100644
--- a/modules/cpufrequtils/manifests/init.pp
+++ b/modules/cpufrequtils/manifests/init.pp
@@ -1,14 +1,6 @@
class cpufrequtils (
$governor = 'performance',
) {
- case $::operatingsystem {
- debian, ubuntu: {
- }
- default: {
- fail("Module ${module_name} is not supported on
${::operatingsystem}")
- }
- }
-
package { 'cpufrequtils':
ensure => present,
}
@@ -22,8 +14,12 @@
# Ubuntu's default initscripts package includes a service called "ondemand"
# which is a one-shot action invoked at startup which sleeps 60 seconds
# and then sets all CPUs to the ondemand governor, thus undoing the work
- # of cpufrequtils :P
- service { 'ondemand': enable => false }
+ # of cpufrequtils. Debian has no such stupidity.
+ if $::operatingsystem == 'Ubuntu' {
+ service { 'ondemand':
+ enable => false,
+ }
+ }
file { '/etc/default/cpufrequtils':
content => "GOVERNOR=${governor}\n",
--
To view, visit https://gerrit.wikimedia.org/r/183784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24ce0a31221418c90d71337265b1d6468637ca01
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
