Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/309572
Change subject: Decom mw2061-mw2074
......................................................................
Decom mw2061-mw2074
Remove mw2061-mw2074 from conftool-data, site.pp and install_server
Bug: T144745
Change-Id: Ie9ea47d912cde8b5a598eb29f1b98508cf78784a
---
M conftool-data/nodes/codfw.yaml
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 3 insertions(+), 87 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/309572/1
diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index d9d59a3..d5e09c0 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -91,20 +91,6 @@
mw2244.codfw.wmnet: [apache2]
mw2245.codfw.wmnet: [apache2]
api_appserver:
- mw2061.codfw.wmnet: [apache2]
- mw2062.codfw.wmnet: [apache2]
- mw2063.codfw.wmnet: [apache2]
- mw2064.codfw.wmnet: [apache2]
- mw2065.codfw.wmnet: [apache2]
- mw2066.codfw.wmnet: [apache2]
- mw2067.codfw.wmnet: [apache2]
- mw2068.codfw.wmnet: [apache2]
- mw2069.codfw.wmnet: [apache2]
- mw2070.codfw.wmnet: [apache2]
- mw2071.codfw.wmnet: [apache2]
- mw2072.codfw.wmnet: [apache2]
- mw2073.codfw.wmnet: [apache2]
- mw2074.codfw.wmnet: [apache2]
mw2075.codfw.wmnet: [apache2]
mw2076.codfw.wmnet: [apache2]
mw2077.codfw.wmnet: [apache2]
diff --git a/manifests/site.pp b/manifests/site.pp
index 79868b2..69e3d90 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2110,7 +2110,7 @@
include base::firewall
}
-# ROW A codfw appservers: mw2017, mw2061-mw2079, and mw2215-2250
+# ROW A codfw appservers: mw2017, mw2075-mw2079, and mw2215-2250
# mw2017.codfw.wmnet is a codfw test appserver
node 'mw2017.codfw.wmnet' {
@@ -2118,8 +2118,8 @@
include base::firewall
}
-#mw2061-2079 are api appservers
-node /^mw20[6-7][0-9]\.codfw\.wmnet$/ {
+#mw2075-2079 are api appservers
+node /^mw207[5-9]\.codfw\.wmnet$/ {
role(mediawiki::appserver::api)
include base::firewall
}
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 26a00aa..16029bd 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -4653,76 +4653,6 @@
fixed-address mw2017.codfw.wmnet;
}
-host mw2061 {
- hardware ethernet 78:2b:cb:2f:ec:f6;
- fixed-address mw2061.codfw.wmnet;
-}
-
-host mw2062 {
- hardware ethernet 78:2b:cb:2e:1c:26;
- fixed-address mw2062.codfw.wmnet;
-}
-
-host mw2063 {
- hardware ethernet 78:2b:cb:29:ce:e0;
- fixed-address mw2063.codfw.wmnet;
-}
-
-host mw2064 {
- hardware ethernet 78:2b:cb:2d:5e:ad;
- fixed-address mw2064.codfw.wmnet;
-}
-
-host mw2065 {
- hardware ethernet 78:2b:cb:2f:bc:f7;
- fixed-address mw2065.codfw.wmnet;
-}
-
-host mw2066 {
- hardware ethernet 78:2b:cb:2d:d1:57;
- fixed-address mw2066.codfw.wmnet;
-}
-
-host mw2067 {
- hardware ethernet 78:2b:cb:2f:e9:3e;
- fixed-address mw2067.codfw.wmnet;
-}
-
-host mw2068 {
- hardware ethernet 78:2b:cb:29:d6:af;
- fixed-address mw2068.codfw.wmnet;
-}
-
-host mw2069 {
- hardware ethernet 78:2b:cb:2f:d1:ac;
- fixed-address mw2069.codfw.wmnet;
-}
-
-host mw2070 {
- hardware ethernet 78:2b:cb:2f:d3:f8;
- fixed-address mw2070.codfw.wmnet;
-}
-
-host mw2071 {
- hardware ethernet 78:2b:cb:2e:22:2a;
- fixed-address mw2071.codfw.wmnet;
-}
-
-host mw2072 {
- hardware ethernet 78:2b:cb:2f:e9:8f;
- fixed-address mw2072.codfw.wmnet;
-}
-
-host mw2073 {
- hardware ethernet 78:2b:cb:2f:ee:12;
- fixed-address mw2073.codfw.wmnet;
-}
-
-host mw2074 {
- hardware ethernet 78:2b:cb:29:54:5d;
- fixed-address mw2074.codfw.wmnet;
-}
-
host mw2075 {
hardware ethernet 90:B1:1C:28:DE:15;
fixed-address mw2075.codfw.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/309572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9ea47d912cde8b5a598eb29f1b98508cf78784a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
