Lcarr has uploaded a new change for review.
https://gerrit.wikimedia.org/r/93527
Change subject: adding new public IP for parsoid
......................................................................
adding new public IP for parsoid
Change-Id: If5d6e87ec248eff698c5f1689dc40135bdc65c41
---
M manifests/lvs.pp
M manifests/site.pp
2 files changed, 22 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/93527/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 1b4a55a..d17d93d 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -405,7 +405,10 @@
'parsoidcache' => {
'eqiad' => "10.2.2.29",
},
- 'search' => {
+ 'publicparsoid' => {
+ 'eqiad' => "208.80.154.162",
+ },
+ 'search' => {
'eqiad' => "10.2.2.30",
},
},
@@ -454,10 +457,11 @@
'pmtpa' => {
'uploadlb' => [ '10.4.0.166',
'10.4.0.187', ],
'uploadsvc' => [ '10.4.0.166',
'10.4.0.187', ],
- },
+ },
},
'parsoid' => {},
'parsoidcache' => {},
+ 'publicparsoid' => {},
'search' => {},
}
}
@@ -857,6 +861,20 @@
'IdleConnection' =>
$idleconnection_monitor_options,
},
},
+ 'publicparsoid' => {
+ 'description' => "Public parsoid wikitext parser for
VisualEditor",
+ 'class' => "high-traffic2",
+ 'sites' => [ "eqiad" ],
+ 'ip' => $service_ips['publicparsoid'][$::site],
+ 'port' => 8000,
+ 'bgp' => "yes",
+ 'depool-threshold' => ".5",
+ 'monitors' => {
+ 'ProxyFetch' => {
+ 'url' => [ 'http://localhost:8000/' ],
+ },
+ 'IdleConnection' =>
$idleconnection_monitor_options,
+ },
'parsoidcache' => {
'description' => "Varnish caches in front of Parsoid",
'class' => "low-traffic",
@@ -1104,6 +1122,7 @@
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 { "parsoid-lb.eqiad.wikimedia.org": ip_address
=> "208.80.154.162", 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" }
diff --git a/manifests/site.pp b/manifests/site.pp
index 6775e93..8826d33 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1572,6 +1572,7 @@
$sip['dns_rec'][$::site],
$sip['osm'][$::site],
$sip['misc_web'][$::site],
+ $sip['publicparsoid'][$::site],
],
/^lvs100[36]$/ => [
$sip['apaches'][$::site],
--
To view, visit https://gerrit.wikimedia.org/r/93527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5d6e87ec248eff698c5f1689dc40135bdc65c41
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
