Elukey has submitted this change and it was merged.
Change subject: Remove references of mw1018->1025 decom appservers
......................................................................
Remove references of mw1018->1025 decom appservers
Bug: T139353
Change-Id: Ia953a301db6c59b06045cad16251567b53cff25a
---
M conftool-data/nodes/eqiad.yaml
M manifests/site.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/scap/files/dsh/group/mediawiki-appserver-canaries
M modules/scap/files/dsh/group/mediawiki-installation
5 files changed, 4 insertions(+), 73 deletions(-)
Approvals:
Elukey: Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index 9cd5d18..ebdb24c 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -75,14 +75,6 @@
mw1289.eqiad.wmnet: [apache2]
mw1290.eqiad.wmnet: [apache2]
appserver:
- mw1018.eqiad.wmnet: [apache2]
- mw1019.eqiad.wmnet: [apache2]
- mw1020.eqiad.wmnet: [apache2]
- mw1021.eqiad.wmnet: [apache2]
- mw1022.eqiad.wmnet: [apache2]
- mw1023.eqiad.wmnet: [apache2]
- mw1024.eqiad.wmnet: [apache2]
- mw1025.eqiad.wmnet: [apache2]
mw1170.eqiad.wmnet: [apache2]
mw1171.eqiad.wmnet: [apache2]
mw1172.eqiad.wmnet: [apache2]
diff --git a/manifests/site.pp b/manifests/site.pp
index 0c47e87..6791a60 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2079,15 +2079,9 @@
role swift::storage
}
-# mw1017-mw1025 are canary appservers
-node /^mw10(1[7-9]|2[0-5])\.eqiad\.wmnet$/ {
+# mw1017 and mw1099 are test appservers
+node /^mw10(17|99)\.eqiad\.wmnet$/ {
role mediawiki::canary_appserver
- include base::firewall
-}
-
-#mw1099 is a test appserver
-node 'mw1099.eqiad.wmnet' {
- role mediawiki::appserver
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 ac72a8e..a9b6b55 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3917,46 +3917,6 @@
fixed-address mw1017.eqiad.wmnet;
}
-host mw1018 {
- hardware ethernet 78:2b:cb:08:7b:42;
- fixed-address mw1018.eqiad.wmnet;
-}
-
-host mw1019 {
- hardware ethernet 84:2b:2b:77:e4:67;
- fixed-address mw1019.eqiad.wmnet;
-}
-
-host mw1020 {
- hardware ethernet 84:2b:2b:77:25:19;
- fixed-address mw1020.eqiad.wmnet;
-}
-
-host mw1021 {
- hardware ethernet 84:2b:2b:77:e6:16;
- fixed-address mw1021.eqiad.wmnet;
-}
-
-host mw1022 {
- hardware ethernet 84:2b:2b:77:28:05;
- fixed-address mw1022.eqiad.wmnet;
-}
-
-host mw1023 {
- hardware ethernet 84:2b:2b:77:d2:93;
- fixed-address mw1023.eqiad.wmnet;
-}
-
-host mw1024 {
- hardware ethernet 84:2b:2b:77:27:c9;
- fixed-address mw1024.eqiad.wmnet;
-}
-
-host mw1025 {
- hardware ethernet 84:2b:2b:78:28:18;
- fixed-address mw1025.eqiad.wmnet;
-}
-
host mw1099 {
hardware ethernet 84:2b:2b:77:e7:72;
fixed-address mw1099.eqiad.wmnet;
diff --git a/modules/scap/files/dsh/group/mediawiki-appserver-canaries
b/modules/scap/files/dsh/group/mediawiki-appserver-canaries
index 80d5111..3540762 100644
--- a/modules/scap/files/dsh/group/mediawiki-appserver-canaries
+++ b/modules/scap/files/dsh/group/mediawiki-appserver-canaries
@@ -1,13 +1,6 @@
-# mw1017-mw1025 are canary appservers
+#mw1017 and mw1099 are test appservers
mw1017.eqiad.wmnet
-mw1018.eqiad.wmnet
-mw1019.eqiad.wmnet
-mw1020.eqiad.wmnet
-mw1021.eqiad.wmnet
-mw1022.eqiad.wmnet
-mw1023.eqiad.wmnet
-mw1024.eqiad.wmnet
-mw1025.eqiad.wmnet
+mw1099.eqiad.wmnet
# mw1261-mw1265 have role mediawiki::canary_appserver
mw1261.eqiad.wmnet
diff --git a/modules/scap/files/dsh/group/mediawiki-installation
b/modules/scap/files/dsh/group/mediawiki-installation
index ee05abf..e47f515 100644
--- a/modules/scap/files/dsh/group/mediawiki-installation
+++ b/modules/scap/files/dsh/group/mediawiki-installation
@@ -17,14 +17,6 @@
snapshot1006.eqiad.wmnet
snapshot1007.eqiad.wmnet
mw1017.eqiad.wmnet
-mw1018.eqiad.wmnet
-mw1019.eqiad.wmnet
-mw1020.eqiad.wmnet
-mw1021.eqiad.wmnet
-mw1022.eqiad.wmnet
-mw1023.eqiad.wmnet
-mw1024.eqiad.wmnet
-mw1025.eqiad.wmnet
mw1099.eqiad.wmnet
mw1114.eqiad.wmnet
mw1115.eqiad.wmnet
--
To view, visit https://gerrit.wikimedia.org/r/301342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia953a301db6c59b06045cad16251567b53cff25a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
