Faidon Liambotis has submitted this change and it was merged.
Change subject: base: remove ioscheduler setting from non-augeas codepath
......................................................................
base: remove ioscheduler setting from non-augeas codepath
The only hosts where we make use of that setting are labstore1001 and
labstore1002, which are both jessies (and thus use the augeas codepath).
Since that part of the codepath is inactive and unused, remove it to
simplify the code going further.
Change-Id: I79f6c7321154a1a8457688e4c66ef43eb110a506
---
M modules/base/manifests/grub.pp
1 file changed, 0 insertions(+), 10 deletions(-)
Approvals:
Rush: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/grub.pp b/modules/base/manifests/grub.pp
index f6c2821..1f4341a 100644
--- a/modules/base/manifests/grub.pp
+++ b/modules/base/manifests/grub.pp
@@ -55,16 +55,6 @@
onlyif => 'test -f /etc/default/grub',
notify => Exec['update-grub'],
}
-
- # The CFQ I/O scheduler is rather suboptimal for some of our I/O
- # workloads. Override with deadline. (the installer does this too)
- exec { 'grub2 iosched deadline':
- path => '/bin:/usr/bin',
- command => "sed -i '/^GRUB_CMDLINE_LINUX=/s/\\\"\$/
elevator=${ioscheduler}\\\"/' /etc/default/grub",
- unless => "grep -q
'^GRUB_CMDLINE_LINUX=.*elevator=${ioscheduler}' /etc/default/grub",
- onlyif => 'test -f /etc/default/grub',
- notify => Exec['update-grub'];
- }
}
exec { 'update-grub':
--
To view, visit https://gerrit.wikimedia.org/r/296727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79f6c7321154a1a8457688e4c66ef43eb110a506
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
