Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91863
Change subject: Use Varnish by default for role::cache::text
......................................................................
Use Varnish by default for role::cache::text
Change-Id: I6682db7f9ec62a89c19148bef899a009e2b609c9
---
M manifests/role/cache.pp
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/91863/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 44d8fb9..f29131c 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -839,19 +839,19 @@
}
class text {
-
+ # FIXME: remove this hack
include lvs::configuration
class { 'lvs::realserver':
realserver_ips =>
flatten([$lvs::configuration::lvs_service_ips[$::realm]['text'][$::site],
$lvs::configuration::lvs_service_ips[$::realm]['text-varnish'][$::site]])
}
- if ($::hostname in ['cp1037', 'cp1038', 'cp1039', 'cp1040'] or
$::hostname =~ /^cp10(5[2-5]|6[5-8])$/ or $::hostname =~
/^amssq(4[7-9]|[56][0-9])$/) or ($::realm == "labs" and $::hostname =~
/^deployment-cache-text/) {
- # Varnish
- include role::cache::varnish::text
+ if ($::hostname =~ /^sq[0-9][0-9]$/ or $::hostname =~
/^cp10([01][0-9]|20)$/ or $::hostname =~ /^amssq(3[1-9]|4[0-6])$/) {
+ class { "role::cache::squid::common": role => "text" }
}
else {
- class { "role::cache::squid::common": role => "text" }
+ # Varnish
+ include role::cache::varnish::text
}
}
--
To view, visit https://gerrit.wikimedia.org/r/91863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6682db7f9ec62a89c19148bef899a009e2b609c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
