Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/145510
Change subject: mediawiki: move SSHD nice override from web.pp to init.pp
......................................................................
mediawiki: move SSHD nice override from web.pp to init.pp
It's a bit bizarre for SSHD to be nice'd -10 on the web appservers but not the
rest. Applying it across all app servers makes things more uniform.
::ssh::server is already included on all servers because it's part of ::base.
Change-Id: I37694e4ab186d2ac9ca60c4b1fcd75e38ad9bbd8
---
M modules/mediawiki/manifests/init.pp
M modules/mediawiki/manifests/web.pp
2 files changed, 10 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/145510/1
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index 47c28b8..4dfd171 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -3,6 +3,7 @@
include ::mediawiki::sync
include ::mediawiki::cgroup
include ::mediawiki::packages
+ include ::ssh::server
file { '/etc/cluster':
owner => 'root',
@@ -44,4 +45,13 @@
class { '::nutcracker':
server_list => $mw_mc_server_list,
}
+
+ # Increase scheduling priority of SSHD
+ file { '/etc/init/ssh.override':
+ content => "nice -10\n",
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ notify => Service['ssh'],
+ }
}
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index d8f91f2..f22e07a 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -5,7 +5,6 @@
include ::mediawiki::monitoring::webserver
include ::mediawiki::web::config
-
file { '/usr/local/apache':
ensure => directory,
}
@@ -23,16 +22,5 @@
command => '/bin/true',
unless => '/bin/ps -C apache2',
notify => Exec['mw-sync'],
- }
-
-
-
- # Has to be less than apache, and apache has to be nice 0 or less to be
- # blue in ganglia.
- file { '/etc/init/ssh.override':
- content => "nice -10\n",
- owner => 'root',
- group => 'root',
- mode => '0444',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/145510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37694e4ab186d2ac9ca60c4b1fcd75e38ad9bbd8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
