Jgreen has submitted this change and it was merged.
Change subject: payments1-4 decom
......................................................................
payments1-4 decom
- remove payments1-4 comments from site.pp
- remove payments1-4 from DHCP
- in ganglia replace payments1/2 with payments1001/1002
RT #6635 - decom pmtpa fundraising servers
per JeffGreen they can be all removed, adding Jeff to confirm
the Ganglia change is also what was expected
Change-Id: Idca420d4636d0879cab46d841b9e5acaaddaf158
---
M manifests/ganglia.pp
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 0 insertions(+), 25 deletions(-)
Approvals:
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 8e0feb3..ab09073 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -300,7 +300,6 @@
"PDF servers" =>
"pdf1.wikimedia.org pdf2.wikimedia.org",
"LVS loadbalancers pmtpa" =>
"lvs1.wikimedia.org lvs2.wikimedia.org",
"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",
"Swift pmtpa" =>
"ms-fe1.pmtpa.wmnet ms-fe2.pmtpa.wmnet",
diff --git a/manifests/site.pp b/manifests/site.pp
index d426108..09d8942 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2733,10 +2733,6 @@
# pappas.wikimedia.org (pmtpa)
# pay-lvs1001.frack.eqiad.wmnet
# pay-lvs1002.frack.eqiad.wmnet
-# payments1.wikimedia.org (pmtpa)
-# payments2.wikimedia.org (pmtpa)
-# payments3.wikimedia.org (pmtpa)
-# payments4.wikimedia.org (pmtpa)
# payments1001.frack.eqiad.wmnet
# payments1002.frack.eqiad.wmnet
# payments1003.frack.eqiad.wmnet
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 06d5aef..ed1cfe2 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3551,26 +3551,6 @@
filename "/pxelinux.0";
}
-host payments1 {
- hardware ethernet 84:2b:2b:54:91:75;
- fixed-address payments1.pmtpa.wmnet;
-}
-
-host payments2 {
- hardware ethernet 84:2b:2b:55:19:25;
- fixed-address payments2.pmtpa.wmnet;
-}
-
-host payments3 {
- hardware ethernet 84:2b:2b:55:16:fc;
- fixed-address payments3.pmtpa.wmnet;
-}
-
-host payments4 {
- hardware ethernet 84:2b:2b:55:16:ea;
- fixed-address payments4.pmtpa.wmnet;
-}
-
host pdf2 {
hardware ethernet 00:21:9B:93:CC:34;
fixed-address pdf2.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/110156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idca420d4636d0879cab46d841b9e5acaaddaf158
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Cmjohnson <[email protected]>
Gerrit-Reviewer: Jgreen <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
