Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339611 )
Change subject: Remove last settings for mc2001->mc2016 from puppet
......................................................................
Remove last settings for mc2001->mc2016 from puppet
Note: mc2001->mc2016 have been replaced by mc2019->mc2036.
As far as I know mc201[78] never existed (Redis/Memcached
configurations supported this fact) so I removed them from
host-entries too.
Bug: T157675
Change-Id: I779c849309f9f30c851b48bb8ab0f000247f6e3f
---
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 0 insertions(+), 98 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 7a11ef9..bcae5eb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1911,14 +1911,6 @@
role(memcached)
}
-# Decommissioned nodes
-# T157675
-node /^mc20(0[1-9]|1[0-6])\.codfw\.wmnet/ {
- role(spare::system)
-}
-
-# New hardware to replace mc2001->mc2016
-# T155755
node /^mc20(19|2[0-9]|3[0-6])\.codfw\.wmnet/ {
role(memcached)
}
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 4e6521a..e2fd54f 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3195,96 +3195,6 @@
fixed-address mc1036.eqiad.wmnet;
}
-host mc2001 {
- hardware ethernet 90:e2:ba:19:55:f0;
- fixed-address mc2001.codfw.wmnet;
-}
-
-host mc2002 {
- hardware ethernet 90:e2:ba:19:4e:c8;
- fixed-address mc2002.codfw.wmnet;
-}
-
-host mc2003 {
- hardware ethernet 90:e2:ba:19:54:10;
- fixed-address mc2003.codfw.wmnet;
-}
-
-host mc2004 {
- hardware ethernet 90:e2:ba:19:56:50;
- fixed-address mc2004.codfw.wmnet;
-}
-
-host mc2005 {
- hardware ethernet 90:e2:ba:19:56:f4;
- fixed-address mc2005.codfw.wmnet;
-}
-
-host mc2006 {
- hardware ethernet 90:e2:ba:19:4e:30;
- fixed-address mc2006.codfw.wmnet;
-}
-
-host mc2007 {
- hardware ethernet 90:e2:ba:19:51:d8;
- fixed-address mc2007.codfw.wmnet;
-}
-
-host mc2008 {
- hardware ethernet 90:e2:ba:19:58:9c;
- fixed-address mc2008.codfw.wmnet;
-}
-
-host mc2009 {
- hardware ethernet 90:e2:ba:19:56:70;
- fixed-address mc2009.codfw.wmnet;
-}
-
-host mc2010 {
- hardware ethernet 90:e2:ba:19:50:dc;
- fixed-address mc2010.codfw.wmnet;
-}
-
-host mc2011 {
- hardware ethernet 90:e2:ba:19:53:fc;
- fixed-address mc2011.codfw.wmnet;
-}
-
-host mc2012 {
- hardware ethernet 90:e2:ba:19:4f:b4;
- fixed-address mc2012.codfw.wmnet;
-}
-
-host mc2013 {
- hardware ethernet 90:e2:ba:19:50:b8;
- fixed-address mc2013.codfw.wmnet;
-}
-
-host mc2014 {
- hardware ethernet 90:e2:ba:19:55:b8;
- fixed-address mc2014.codfw.wmnet;
-}
-
-host mc2015 {
- hardware ethernet 90:e2:ba:1d:47:c0;
- fixed-address mc2015.codfw.wmnet;
-}
-
-host mc2016 {
- hardware ethernet 90:e2:ba:19:4e:48;
- fixed-address mc2016.codfw.wmnet;
-}
-
-host mc2017 {
- hardware ethernet 00:10:18:ef:fb:90;
- fixed-address mc2017.codfw.wmnet;
-}
-
-host mc2018 {
- hardware ethernet 00:10:18:ef:fd:60;
- fixed-address mc2018.codfw.wmnet;
-}
-
host mc2019 {
hardware ethernet 94:18:82:79:36:ac;
fixed-address mc2019.codfw.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/339611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I779c849309f9f30c851b48bb8ab0f000247f6e3f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Cmjohnson <cmjohn...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
