Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102144
Change subject: Decommission bits.pmtpa servers
......................................................................
Decommission bits.pmtpa servers
Change-Id: Ia0e954b00c6972edf162a841ad4cfd2b279efb91
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/102144/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 6bfe748..afedea3 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -76,7 +76,7 @@
"esams" => [],
},
"bits" => {
- "pmtpa" => ["sq67.wikimedia.org",
"sq68.wikimedia.org", "sq69.wikimedia.org", "sq70.wikimedia.org"],
+ "pmtpa" => [],
"eqiad" => ['cp1056.eqiad.wmnet',
'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet', 'cp1070.eqiad.wmnet'],
"esams" =>
["cp3019.esams.wikimedia.org", "cp3020.esams.wikimedia.org",
"cp3021.esams.wikimedia.org", "cp3022.esams.wikimedia.org"],
"ulsfo" => ["cp4001.ulsfo.wmnet",
"cp4002.ulsfo.wmnet", "cp4003.ulsfo.wmnet", "cp4004.ulsfo.wmnet"],
@@ -242,7 +242,7 @@
"esams" => [],
},
"bits" => {
- "pmtpa" => [],
+ "pmtpa" => ["sq67.wikimedia.org",
"sq68.wikimedia.org", "sq69.wikimedia.org", "sq70.wikimedia.org"],
"eqiad" => [],
"esams" => [
"knsq1.esams.wikimedia.org",
diff --git a/manifests/site.pp b/manifests/site.pp
index 8c5a713..92f2af9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2435,25 +2435,6 @@
include role::protoproxy::ssl
}
-# sq67-70 are varnishes for bits.wikimedia.org
-node /sq(6[7-9]|70)\.wikimedia\.org/ {
- if $::hostname =~ /^sq6[68]$/ {
- $ganglia_aggregator = true
- }
-
- interface::aggregate { "bond0":
- orig_interface => "eth0",
- members => [ "eth0", "eth1", "eth2", "eth3" ]
- }
-
- interface::add_ip6_mapped { "main":
- require => Interface::Aggregate[bond0],
- interface => "bond0"
- }
-
- include role::cache::bits
-}
-
node "stafford.pmtpa.wmnet" {
include standard
--
To view, visit https://gerrit.wikimedia.org/r/102144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0e954b00c6972edf162a841ad4cfd2b279efb91
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
