Mark Bergsma has submitted this change and it was merged.
Change subject: Make Varnish the default for upload now
......................................................................
Make Varnish the default for upload now
We'll remove the pmtpa upload Squids entirely soon.
Change-Id: I5c06810fcaaa79769126d3b164e4e0acaf2aa039
---
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 2d3f3ae..30dbfe5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -841,7 +841,7 @@
class upload {
# FIXME: remove this hack
- if $::site in ["eqiad","esams"] or $::realm == 'labs' {
+ if $::realm == "labs" or $::site != "pmtpa" {
# Varnish
include role::cache::varnish::upload
}
--
To view, visit https://gerrit.wikimedia.org/r/90530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c06810fcaaa79769126d3b164e4e0acaf2aa039
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[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
