Mark Bergsma has submitted this change and it was merged.
Change subject: Split off wikidata into a separate LVS service 'text-varnish'
......................................................................
Split off wikidata into a separate LVS service 'text-varnish'
We are going to test Text Varnish with Wikidata first
HTTPS and IPv6 will remain on Squid, for now.
Change-Id: Iab6da008a6d6fff3215fa712abda0bd7d1163901
---
M manifests/lvs.pp
M manifests/role/cache.pp
M manifests/site.pp
3 files changed, 35 insertions(+), 3 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 5334db4..7d11129 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -121,7 +121,6 @@
'wikiversitylb' => "208.80.152.207",
'mediawikilb' => "208.80.152.208",
'foundationlb' => "208.80.152.209",
- 'wikidatalb' => "208.80.152.218",
'wikivoyagelb' => "208.80.152.219"
},
'eqiad' => {
@@ -136,7 +135,6 @@
'wikiversitylb' => "208.80.154.231",
'mediawikilb' => "208.80.154.232",
'foundationlb' => "208.80.154.233",
- 'wikidatalb' => "208.80.154.242",
'wikivoyagelb' => "208.80.154.243"
},
'esams' => {
@@ -151,8 +149,18 @@
'wikiversitylb' => "91.198.174.231",
'mediawikilb' => "91.198.174.232",
'foundationlb' => "91.198.174.235",
- 'wikidatalb' => '91.198.174.237',
'wikivoyagelb' => '91.198.174.238',
+ },
+ },
+ 'text-varnish' => {
+ 'pmtpa' => {
+ 'wikidatalb' => '208.80.152.218',
+ },
+ 'eqiad' => {
+ 'wikidatalb' => '208.80.154.242',
+ },
+ 'esams' => {
+ 'wikidatalb' => '91.198.174.237',
},
},
'https' => {
@@ -389,6 +397,9 @@
'text' => {
'pmtpa' => "10.4.0.4",
},
+ 'text-varnish' => {
+ 'pmtpa' => [],
+ },
'apaches' => {
'pmtpa' => "10.4.0.254",
},
@@ -451,6 +462,20 @@
'IdleConnection' =>
$idleconnection_monitor_options
},
},
+ 'text-varnish' => {
+ 'description' => "Main wiki platform LVS service,
text.${::site}.wikimedia.org (Varnish)",
+ 'class' => 'high-traffic1',
+ 'sites' => [ 'pmtpa', 'eqiad', 'esams' ],
+ 'ip' => $service_ips['text-varnish'][$::site],
+ 'bgp' => 'yes',
+ 'depool-threshold' => '.5',
+ 'monitors' => {
+ 'ProxyFetch' => {
+ 'url' => [
'http://en.wikipedia.org/wiki/Main_Page' ],
+ },
+ 'IdleConnection' =>
$idleconnection_monitor_options
+ },
+ },
"https" => {
'description' => "HTTPS services",
'class' => "https",
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 0c3b7ff..7b127d8 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -777,6 +777,10 @@
else {
class { "role::cache::squid::common": role => "text" }
}
+
+ # FIXME: remove this hack
+ include lvs::configuration
+ Class['lvs::realserver'] { realserver_ips +>
$lvs::configuration::lvs_service_ips[$::realm]['text-varnish'][$::site] }
}
class upload {
diff --git a/manifests/site.pp b/manifests/site.pp
index 2ff4826..b023c45 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -86,6 +86,7 @@
$lvs_balancer_ips = $::hostname ? {
/^amslvs[13]$/ => [
$sip['text'][$::site],
+ $sip['text-varnish'][$::site],
$sip['bits'][$::site],
$sip['mobile'][$::site],
$sip['ipv6'][$::site],
@@ -1389,6 +1390,7 @@
],
/^lvs[26]$/ => [
$sip['text'][$::site],
+ $sip['text-varnish'][$::site],
$sip['bits'][$::site],
$sip['ipv6'][$::site],
],
@@ -1455,6 +1457,7 @@
$lvs_balancer_ips = $::hostname? {
/^lvs100[14]$/ => [
$sip['text'][$::site],
+ $sip['text-varnish'][$::site],
$sip['bits'][$::site],
$sip['mobile'][$::site],
$sip['ipv6'][$::site],
--
To view, visit https://gerrit.wikimedia.org/r/74131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab6da008a6d6fff3215fa712abda0bd7d1163901
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
