Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/65278
Change subject: run twemproxy daemon on mw servers
......................................................................
run twemproxy daemon on mw servers
Change-Id: I5a9b82a8187f8567d37c4eee396350550c1a8bed
---
A files/upstart/twemproxy.conf
M modules/mediawiki/manifests/init.pp
M modules/mediawiki/manifests/packages.pp
A modules/mediawiki/manifests/twemproxy.pp
4 files changed, 31 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/65278/1
diff --git a/files/upstart/twemproxy.conf b/files/upstart/twemproxy.conf
new file mode 100644
index 0000000..8ab76e1
--- /dev/null
+++ b/files/upstart/twemproxy.conf
@@ -0,0 +1,13 @@
+description "twemproxy"
+
+start on (net-device-up
+ and runlevel [2345])
+stop on runlevel [!2345]
+
+pre-start script
+ [ -f /etc/wikimedia-site ] || { stop; exit 0; }
+ [ -f "/usr/local/apache/common/wmf-config/twemproxy-$(cat
/etc/wikimedia-site)".yaml ] || { stop; exit 0; }
+end script
+
+exec /usr/local/bin/nutcracker -m 65536 -c
"/usr/local/apache/common/wmf-config/twemproxy-$(cat /etc/wikimedia-site).yaml"
+
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index d440e03..c8c562c 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -16,4 +16,8 @@
}
include users::mwdeploy, users::l10nupdate, users::sudo, sync, cgroup,
packages
+
+ if $::realm == 'production' {
+ include twemproxy
+ }
}
diff --git a/modules/mediawiki/manifests/packages.pp
b/modules/mediawiki/manifests/packages.pp
index 782a703..9c570a9 100644
--- a/modules/mediawiki/manifests/packages.pp
+++ b/modules/mediawiki/manifests/packages.pp
@@ -11,7 +11,7 @@
}
}
- package { [ 'wikimedia-task-appserver', 'twemproxy' ]:
+ package { 'wikimedia-task-appserver':
ensure => latest;
}
}
diff --git a/modules/mediawiki/manifests/twemproxy.pp
b/modules/mediawiki/manifests/twemproxy.pp
new file mode 100644
index 0000000..89efc44
--- /dev/null
+++ b/modules/mediawiki/manifests/twemproxy.pp
@@ -0,0 +1,13 @@
+class mediawiki::twemproxy {
+ package { 'twemproxy':
+ ensure => latest;
+ }
+
+ upstart_job { "twemproxy": install => "true" }
+
+ service { twemproxy:
+ require => [ Package[twemproxy], Upstart_job[twemproxy] ],
+ provider => upstart,
+ ensure => running;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/65278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a9b82a8187f8567d37c4eee396350550c1a8bed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher <afeld...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
