Ryan Lane has submitted this change and it was merged.
Change subject: Kill Parsoid in Tampa
......................................................................
Kill Parsoid in Tampa
Will decommission the hosts in my next commit
Change-Id: I4c639a31a1176c8fe4f56c962d697175a9fe5967
---
M files/dsh/group/parsoid
M manifests/ganglia.pp
M manifests/lvs.pp
M manifests/role/cache.pp
M manifests/role/deployment.pp
M manifests/site.pp
6 files changed, 5 insertions(+), 36 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
RobH: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/files/dsh/group/parsoid b/files/dsh/group/parsoid
index f839d1f..9c2ab1b 100644
--- a/files/dsh/group/parsoid
+++ b/files/dsh/group/parsoid
@@ -1,8 +1,3 @@
-wtp1
-mexia
-tola
-lardner
-kuo
wtp1001
wtp1002
wtp1003
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index fdf553a..1d9907e 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -321,9 +321,7 @@
"Memcached eqiad" =>
"mc1001.eqiad.wmnet mc1002.eqiad.wmnet",
"Upload caches esams" =>
"hooft.esams.wikimedia.org:11671 cp3003.esams.wikimedia.org
cp3004.esams.wikimedia.org",
"Ceph cluster esams" =>
"ms-be3001.esams.wikimedia.org ms-be3002.esams.wikimedia.org",
- "Parsoid pmtpa" =>
"wtp1.pmtpa.wmnet",
"Parsoid eqiad" =>
"wtp1001.eqiad.wmnet",
- "Parsoid Varnish pmtpa" =>
"constable.pmtpa.wmnet",
"Parsoid Varnish eqiad" =>
"cerium.wikimedia.org",
"Redis eqiad" =>
"rdb1001.eqiad.wmnet rdb1002.eqiad.wmnet",
"Labs NFS cluster pmtpa" =>
"labstore3.pmtpa.wmnet labstore4.pmtpa.wmnet",
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 83232bd..c43d2a2 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -376,11 +376,9 @@
'eqiad' => "208.80.154.241",
},
'parsoid' => {
- 'pmtpa' => "10.2.1.28",
'eqiad' => "10.2.2.28",
},
'parsoidcache' => {
- 'pmtpa' => "10.2.1.29",
'eqiad' => "10.2.2.29",
},
},
@@ -751,7 +749,7 @@
"parsoid" => {
'description' => "Parsoid wikitext parser for
VisualEditor",
'class' => "low-traffic",
- 'sites' => [ "pmtpa", "eqiad" ],
+ 'sites' => [ "eqiad" ],
'ip' => $service_ips['parsoid'][$::site],
'port' => 8000,
'bgp' => "yes",
@@ -766,7 +764,7 @@
'parsoidcache' => {
'description' => "Varnish caches in front of Parsoid",
'class' => "low-traffic",
- 'sites' => [ "pmtpa", "eqiad" ],
+ 'sites' => [ "eqiad" ],
'ip' => $service_ips['parsoidcache'][$::site],
'port' => 80,
'bgp' => "yes",
@@ -955,7 +953,6 @@
monitor_service_lvs_http { "rendering.svc.eqiad.wmnet": ip_address =>
"10.2.2.21", check_command => "check_http_lvs!en.wikipedia.org!/wiki/Main_Page"
}
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.pmtpa.wmnet": ip_address =>
"10.2.1.28", check_command => "check_http_on_port!8000", contact_group =>
"admins,parsoid" }
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" }
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 07e41fb..ee268d9 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -185,7 +185,7 @@
"esams" => []
},
"parsoid" => {
- "pmtpa" => ["celsus.pmtpa.wmnet",
"constable.pmtpa.wmnet"],
+ "pmtpa" => [],
"eqiad" => ["cerium.wikimedia.org",
"titanium.wikimedia.org"],
"esams" => []
}
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index bf46065..7e91b3c 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -109,7 +109,7 @@
class role::deployment::salt_masters::production {
$mediawiki_regex =
"^(srv|mw|snapshot|tmh)|(searchidx2|searchidx1001).*.(eqiad|pmtpa).wmnet$|^(hume|spence|fenari).wikimedia.org$"
- $parsoid_regex =
"^(wtp1|mexia|tola|lardner|kuo|wtp10[01][0-9]|wtp102[0-4])\..*"
+ $parsoid_regex = "^(wtp10[01][0-9]|wtp102[0-4])\..*"
$eventlogging_regex = "^(vanadium).eqiad.wmnet$"
$deployment_servers = {
"pmtpa" => "tin.eqiad.wmnet",
diff --git a/manifests/site.pp b/manifests/site.pp
index 922e54b..bcbb09f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2865,28 +2865,7 @@
install_certificate{ "star.wikimedia.org": }
}
-node /(wtp1|kuo|lardner|mexia|tola)\.pmtpa\.wmnet/ {
- $cluster = "parsoid"
- $nagios_group = "${cluster}_$::site"
-
- if $hostname == "wtp1" {
- $ganglia_aggregator = true
- }
-
- include standard,
- admins::roots,
- admins::parsoid,
- misc::parsoid
-
- class { "lvs::realserver": realserver_ips => [ "10.2.1.28" ] }
-
-}
-
-node /((cerium|titanium)\.wikimedia\.org|(celsus|constable)\.pmtpa\.wmnet)/ {
- if $hostname == "constable" {
- $ganglia_aggregator = true
- }
-
+node /(cerium|titanium)\.wikimedia\.org/ {
if $hostname == "cerium" {
$ganglia_aggregator = true
}
--
To view, visit https://gerrit.wikimedia.org/r/67350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4c639a31a1176c8fe4f56c962d697175a9fe5967
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
