Alexandros Kosiaris has submitted this change and it was merged.
Change subject: decom hooper,eiximenis
......................................................................
decom hooper,eiximenis
Remove hooper, eiximenis from all possible places in configuration
Change-Id: I45d332c371833ab0ddcc9a90da8ba4428c9a807f
---
M files/dsh/group/misc_pmtpa
M manifests/ganglia.pp
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
4 files changed, 2 insertions(+), 19 deletions(-)
Approvals:
Guido.iaquinti: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index 6036d4f..1bff49f 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -9,7 +9,6 @@
formey
grosley
harmon
-hooper
hume
kaulen
linne
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index fa06976..6c859f8 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -274,7 +274,7 @@
# neon runs gmetad for ganglios
/^neon$/: {
$data_sources = {
- "Miscellaneous" =>
"hooper.wikimedia.org tarin.pmtpa.wmnet",
+ "Miscellaneous" =>
"tarin.pmtpa.wmnet",
"Miscellaneous eqiad" =>
"carbon.wikimedia.org ms1004.eqiad.wmnet",
"Analytics cluster eqiad" =>
"analytics1009.eqiad.wmnet analytics1010.eqiad.wmnet analytics1014.eqiad.wmnet",
"Mobile caches eqiad" =>
"cp1046.eqiad.wmnet cp1047.eqiad.wmnet",
@@ -285,7 +285,6 @@
}
default: {
$data_sources = {
- "Decommissioned servers pmtpa" =>
"eiximenis.wikimedia.org",
"Video scalers pmtpa" => "tmh1.pmtpa.wmnet
tmh2.pmtpa.wmnet",
"Video scalers eqiad" =>
"tmh1001.eqiad.wmnet tmh1002.eqiad.wmnet",
"Image scalers pmtpa" => "mw75.pmtpa.wmnet
mw76.pmtpa.wmnet",
@@ -301,7 +300,7 @@
"MySQL" =>
"db1050.eqiad.wmnet",
"PDF servers" =>
"pdf1.wikimedia.org pdf2.wikimedia.org",
"LVS loadbalancers pmtpa" =>
"lvs1.wikimedia.org lvs2.wikimedia.org",
- "Miscellaneous" =>
"hooper.wikimedia.org tarin.pmtpa.wmnet",
+ "Miscellaneous" =>
"tarin.pmtpa.wmnet",
"Fundraiser payments" =>
"payments1.wikimedia.org payments2.wikimedia.org",
"Fundraising eqiad" =>
"pay-lvs1001.frack.eqiad.wmnet pay-lvs1002.frack.eqiad.wmnet",
"SSL cluster esams" =>
"hooft.esams.wikimedia.org:11675 ssl3001.esams.wikimedia.org
ssl3002.esams.wikimedia.org",
diff --git a/manifests/site.pp b/manifests/site.pp
index 187e527..1b1f740 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1130,16 +1130,6 @@
class { "ganglia_new::monitor::aggregator": sites => ["pmtpa", "eqiad"] }
}
-node "hooper.wikimedia.org" {
- $ganglia_aggregator = true
-
- include standard,
- admins::roots,
- svn::client
-
- install_certificate{ "star.wikimedia.org": }
-}
-
node "hume.wikimedia.org" {
$cluster = "misc"
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 2328ad9..06d5aef 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1310,11 +1310,6 @@
fixed-address hooft.esams.wikimedia.org;
}
-host hooper {
- hardware ethernet 84:2b:2b:06:4c:58;
- fixed-address hooper.wikimedia.org;
-}
-
host hydrogen {
hardware ethernet 78:2b:cb:09:0c:21;
fixed-address hydrogen.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/107159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45d332c371833ab0ddcc9a90da8ba4428c9a807f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Guido.iaquinti <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
