RobH has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330621 )
Change subject: decommission mw2075-2089
......................................................................
decommission mw2075-2089
These 15 systems are being decommissioned to be replaced with 10 new
systems
T154621
Change-Id: I24b782d75113be021db73311fc01f4b8ec9d2633
---
M conftool-data/nodes/codfw.yaml
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 0 insertions(+), 103 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/330621/1
diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index e1e1d86..06d97bb 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -91,11 +91,6 @@
mw2244.codfw.wmnet: [apache2,nginx]
mw2245.codfw.wmnet: [apache2,nginx]
api_appserver:
- mw2075.codfw.wmnet: [apache2,nginx]
- mw2076.codfw.wmnet: [apache2,nginx]
- mw2077.codfw.wmnet: [apache2,nginx]
- mw2078.codfw.wmnet: [apache2,nginx]
- mw2079.codfw.wmnet: [apache2,nginx]
mw2120.codfw.wmnet: [apache2,nginx]
mw2121.codfw.wmnet: [apache2,nginx]
mw2122.codfw.wmnet: [apache2,nginx]
@@ -146,10 +141,6 @@
mw2219.codfw.wmnet: [apache2,nginx]
mw2220.codfw.wmnet: [apache2,nginx]
imagescaler:
- mw2086.codfw.wmnet: [apache2,nginx]
- mw2087.codfw.wmnet: [apache2,nginx]
- mw2088.codfw.wmnet: [apache2,nginx]
- mw2089.codfw.wmnet: [apache2,nginx]
mw2148.codfw.wmnet: [apache2,nginx]
mw2149.codfw.wmnet: [apache2,nginx]
mw2150.codfw.wmnet: [apache2,nginx]
diff --git a/manifests/site.pp b/manifests/site.pp
index a99a4cc..ae2a0a9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2141,25 +2141,6 @@
include base::firewall
}
-#mw2075-2079 are api appservers
-node /^mw207[5-9]\.codfw\.wmnet$/ {
- role(mediawiki::appserver::api)
- include base::firewall
-}
-
-
-# ROW B codfw appservers: mw2080-mw2147
-#mw2080-mw2085 are jobrunners
-node /^mw208[0-5]\.codfw\.wmnet$/ {
- role(mediawiki::jobrunner)
- include base::firewall
-}
-
-#mw2086-mw2089 are imagescalers
-node /^mw208[6-9]\.codfw\.wmnet$/ {
- role(mediawiki::imagescaler)
-}
-
#mw2090-mw2098, mw2100-mw2119 are appservers
node /^mw2(09[0-8]|1[0-1][0-9])\.codfw\.wmnet$/ {
role(mediawiki::appserver)
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 60b715e..77d21ad 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -4687,81 +4687,6 @@
fixed-address mw2017.codfw.wmnet;
}
-host mw2075 {
- hardware ethernet 90:B1:1C:28:DE:15;
- fixed-address mw2075.codfw.wmnet;
-}
-
-host mw2076 {
- hardware ethernet 90:B1:1C:27:82:C0;
- fixed-address mw2076.codfw.wmnet;
-}
-
-host mw2077 {
- hardware ethernet 90:B1:1C:28:DA:CA;
- fixed-address mw2077.codfw.wmnet;
-}
-
-host mw2078 {
- hardware ethernet 90:B1:1C:28:DB:7A;
- fixed-address mw2078.codfw.wmnet;
-}
-
-host mw2079 {
- hardware ethernet 90:B1:1C:28:DB:16;
- fixed-address mw2079.codfw.wmnet;
-}
-
-host mw2080 {
- hardware ethernet 90:B1:1C:28:E0:3D;
- fixed-address mw2080.codfw.wmnet;
-}
-
-host mw2081 {
- hardware ethernet 90:B1:1C:28:DB:AA;
- fixed-address mw2081.codfw.wmnet;
-}
-
-host mw2082 {
- hardware ethernet 90:B1:1C:28:DF:2C;
- fixed-address mw2082.codfw.wmnet;
-}
-
-host mw2083 {
- hardware ethernet 90:B1:1C:27:8B:73;
- fixed-address mw2083.codfw.wmnet;
-}
-
-host mw2084 {
- hardware ethernet 90:B1:1C:27:97:21;
- fixed-address mw2084.codfw.wmnet;
-}
-
-host mw2085 {
- hardware ethernet 90:B1:1C:28:DF:28;
- fixed-address mw2085.codfw.wmnet;
-}
-
-host mw2086 {
- hardware ethernet 90:B1:1C:25:95:4D;
- fixed-address mw2086.codfw.wmnet;
-}
-
-host mw2087 {
- hardware ethernet 90:B1:1C:25:D8:0A;
- fixed-address mw2087.codfw.wmnet;
-}
-
-host mw2088 {
- hardware ethernet 90:B1:1C:25:91:2C;
- fixed-address mw2088.codfw.wmnet;
-}
-
-host mw2089 {
- hardware ethernet 90:B1:1C:25:90:34;
- fixed-address mw2089.codfw.wmnet;
-}
-
host mw2090 {
hardware ethernet 90:B1:1C:28:E2:1B;
fixed-address mw2090.codfw.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/330621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24b782d75113be021db73311fc01f4b8ec9d2633
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
