Mark Bergsma has submitted this change and it was merged.
Change subject: Migrating Parsoid caches to public
......................................................................
Migrating Parsoid caches to public
We'll use the existing parsoidcache LVS cluster for this,
but migrate it to the 'public' high-traffic2 class.
Change-Id: If5d6e87ec248eff698c5f1689dc40135bdc65c41
---
M manifests/lvs.pp
M manifests/site.pp
2 files changed, 12 insertions(+), 5 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 851c1ea..6e83e12 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -415,7 +415,7 @@
'eqiad' => "10.2.2.28",
},
'parsoidcache' => {
- 'eqiad' => "10.2.2.29",
+ 'eqiad' => { 'parsoidlb' => '208.80.154.248',
'parsoidlb6' => '2620:0:861:ed1a::3:14', 'parsoidsvc' => '10.2.2.29' },
},
'search' => {
'eqiad' => "10.2.2.30",
@@ -466,7 +466,7 @@
'pmtpa' => {
'uploadlb' => [ '10.4.0.166',
'10.4.0.187', ],
'uploadsvc' => [ '10.4.0.166',
'10.4.0.187', ],
- },
+ },
},
'parsoid' => {},
'parsoidcache' => {},
@@ -871,7 +871,7 @@
},
'parsoidcache' => {
'description' => "Varnish caches in front of Parsoid",
- 'class' => "low-traffic",
+ 'class' => "high-traffic2",
'sites' => [ "eqiad" ],
'ip' => $service_ips['parsoidcache'][$::site],
'port' => 80,
@@ -1116,7 +1116,6 @@
monitor_service_lvs_http { "ms-fe.pmtpa.wmnet": ip_address =>
"10.2.1.27", check_command =>
"check_http_lvs!ms-fe.pmtpa.wmnet!/monitoring/backend" }
monitor_service_lvs_http { "ms-fe.eqiad.wmnet": ip_address =>
"10.2.2.27", check_command =>
"check_http_lvs!ms-fe.eqiad.wmnet!/monitoring/backend" }
monitor_service_lvs_http { "parsoid.svc.eqiad.wmnet": ip_address =>
"10.2.2.28", check_command => "check_http_on_port!8000", contact_group =>
"admins,parsoid" }
- monitor_service_lvs_http { "parsoidcache.svc.eqiad.wmnet": ip_address
=> "10.2.2.29", check_command => "check_http_lvs!parsoid!/", contact_group =>
"admins,parsoid" }
monitor_service_lvs_http { "search.svc.eqiad.wmnet": ip_address =>
"10.2.2.30", check_command => "check_http_on_port!9200", contact_group =>
"admins" }
monitor_service_lvs_custom { "search-pool1.svc.eqiad.wmnet": ip_address
=> "10.2.2.11", port => 8123, description => "LVS Lucene", check_command =>
"check_lucene" }
@@ -1362,6 +1361,13 @@
uri => 'varnishcheck!/';
}
+ monitor_service_lvs_http { 'parsoid-lb.eqiad.wikimedia.org':
+ ip_address => $ip['parsoidcache']['eqiad']['parsoidlb'],
+ check_command => "check_http_on_port!8000",
+ contact_group => "admins,parsoid"
+ }
+ # TODO: ipv6
+
# ESAMS
monitor_service_lvs_http_https {
diff --git a/manifests/site.pp b/manifests/site.pp
index 86f2a00..7de6f3c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1583,6 +1583,7 @@
$sip['dns_rec'][$::site],
$sip['osm'][$::site],
$sip['misc_web'][$::site],
+ $sip['parsoidcache'][$::site],
],
/^lvs100[36]$/ => [
$sip['apaches'][$::site],
@@ -1596,7 +1597,7 @@
$sip['search_prefix'][$::site],
$sip['swift'][$::site],
$sip['parsoid'][$::site],
- $sip['parsoidcache'][$::site],
+ $sip['parsoidcache'][$::site], # FIXME: remove after migration
$sip['search'][$::site]
]
}
--
To view, visit https://gerrit.wikimedia.org/r/93527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If5d6e87ec248eff698c5f1689dc40135bdc65c41
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr <[email protected]>
Gerrit-Reviewer: GWicke <[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
