Mark Bergsma has submitted this change and it was merged.
Change subject: role::cache::upload now uses varnish on labs
......................................................................
role::cache::upload now uses varnish on labs
Turns out installing squid on beta is broken beyond repair:
- the Lucid version of puppet choke on invalid syntax in our puppet
manifests.
- on Precise the WMF squid packages depends on libdb4.7 which is not
provided under that distribution.
There is an existing hack to get upload cache to use Varnish instead of
squid. This patch reuse that hack to get Varnish on labs.
(bug 45122) migrate all beta instance from Lucid to Precise
Change-Id: If79da7686402a4f6da69eba2d157a449f2c8d3a1
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index c3fef1f..c01bc38 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -358,7 +358,7 @@
class upload {
# FIXME: remove this hack
- if $::site == "eqiad" or ($::site == "esams" and $::hostname =~
/^cp30/) {
+ if $::site == "eqiad" or ($::site == "esams" and $::hostname =~
/^cp30/) or $::realm == 'labs' {
# Varnish
$cluster = "cache_upload"
--
To view, visit https://gerrit.wikimedia.org/r/49708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If79da7686402a4f6da69eba2d157a449f2c8d3a1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
