Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/68385
Change subject: Fix tier 2 bits backends
......................................................................
Fix tier 2 bits backends
Change-Id: I358facbdc98f07c36c21d5a38186cefa63d62b82
---
M manifests/role/cache.pp
1 file changed, 17 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/68385/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index ce31896..05ff61a 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -302,6 +302,10 @@
'appservers' =>
$lvs::configuration::lvs_service_ips['production']['apaches'],
'api' =>
$lvs::configuration::lvs_service_ips['production']['api'],
'rendering' =>
$lvs::configuration::lvs_service_ips['production']['rendering'],
+ 'bits' => {
+ 'pmtpa' =>
$lvs::configuration::lvs_service_ips['production']['bits']['pmtpa']['bitslb'],
+ 'eqiad' =>
$lvs::configuration::lvs_service_ips['production']['bits']['eqiqd']['bitslb'],
+ }
'bits_appservers' => {
'pmtpa' => [ "srv248.pmtpa.wmnet",
"srv249.pmtpa.wmnet", "mw60.pmtpa.wmnet", "mw61.pmtpa.wmnet" ],
'eqiad' => [ "mw1149.eqiad.wmnet",
"mw1150.eqiad.wmnet", "mw1151.eqiad.wmnet", "mw1152.eqiad.wmnet" ],
@@ -324,6 +328,9 @@
'10.4.0.166', #
deployment-apache32
'10.4.0.187', #
deployment-apache33
],
+ },
+ 'bits' => {
+ 'pmtpa' => "10.4.0.252",
},
'bits_appservers' => {
'pmtpa' => [
@@ -766,9 +773,15 @@
'enable_geoiplookup' => true,
}
+ $default_backend = "backend"
$varnish_directors = {
- "backend" =>
$::role::cache::configuration::backends[$::realm]['bits_appservers'][$::mw_primary],
- "test_wikipedia" =>
$::role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
+ 1 => {
+ "backend" =>
$::role::cache::configuration::backends[$::realm]['bits_appservers'][$::mw_primary],
+ "test_wikipedia" =>
$::role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
+ },
+ 2 => {
+ "backend" =>
$role::cache::configuration::backends[$::realm]['bits']
+ }
}
case $::realm {
@@ -778,9 +791,6 @@
$probe = "bits"
}
default: {
- $varnish_directors = {
- "backend" => [
"208.80.152.210", "208.80.154.234" ] # [ bits-lb.pmtpa, bits-lb.eqiad ]
- }
$probe = "varnish"
}
}
@@ -808,9 +818,10 @@
port => 80,
admin_port => 6082,
storage => "-s malloc,2G",
- directors => $varnish_directors,
+ directors => $varnish_directors[$cluster_tier],
director_type => "random",
vcl_config => {
+ 'default_backend' => $default_backend,
'retry503' => 4,
'retry5xx' => 1,
'cache4xx' => "1m",
--
To view, visit https://gerrit.wikimedia.org/r/68385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I358facbdc98f07c36c21d5a38186cefa63d62b82
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
