Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165770
Change subject: Make beta jobrunners use beta nutcracker config
......................................................................
Make beta jobrunners use beta nutcracker config
Change-Id: I4954ba5b2060a14ed436310a3b62b08f1d1ad141
---
M manifests/role/beta.pp
1 file changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/165770/1
diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index ecd6a88..bf7bb33 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -65,6 +65,7 @@
require ::role::labs::lvm::srv
include ::beta::common
include ::beta::scap::target
+ include ::role::beta::nutcracker
# Allow ssh inbound from deployment-bastion.eqiad.wmflabs for scap
ferm::rule { 'deployment-bastion-scap-ssh':
@@ -98,6 +99,16 @@
check_command =>
'check_http_url!commons.wikimedia.beta.wmflabs.org|http://commons.wikimedia.beta.wmflabs.org/wiki/Main_Page',
}
+ # Beta application servers have some ferm DNAT rewriting rules (bug
+ # 45868) so we have to explicitly allow http (port 80)
+ ferm::service { 'http':
+ proto => 'tcp',
+ port => 'http'
+ }
+}
+
+class role::beta::nutcracker {
+
class { '::nutcracker':
mbuf_size => '64k',
pools => {
@@ -118,12 +129,6 @@
},
}
- # Beta application servers have some ferm DNAT rewriting rules (bug
- # 45868) so we have to explicitly allow http (port 80)
- ferm::service { 'http':
- proto => 'tcp',
- port => 'http'
- }
}
class role::beta::videoscaler {
@@ -136,6 +141,7 @@
include ::beta::common
include role::mediawiki::common
include ::mediawiki
+ include ::role::beta::nutcracker
class { '::mediawiki::jobrunner':
aggr_servers => [ 'deployment-redis01' ],
--
To view, visit https://gerrit.wikimedia.org/r/165770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4954ba5b2060a14ed436310a3b62b08f1d1ad141
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
