Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/297363
Change subject: jobrunners: decommission mw1009-16
......................................................................
jobrunners: decommission mw1009-16
These severs are very old and out of warranty.
Change-Id: If5571f3b370bf0e88fb84018d0f6210b3b12b928
---
M hieradata/common/scap/dsh.yaml
M manifests/site.pp
M modules/scap/files/dsh/group/mediawiki-installation
3 files changed, 5 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/297363/1
diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index 7b2475d..18e769b 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -1,11 +1,11 @@
# Scap proxy list
#
scap_proxies:
- - "mw1010.eqiad.wmnet" # A6
- - "mw1097.eqiad.wmnet" # B7
- - "mw1216.eqiad.wmnet" # B8
- - "mw1161.eqiad.wmnet" # C6
- - "mw1201.eqiad.wmnet" # D5
+ - "mw1280.eqiad.wmnet" # A7 eqiad
+ - "mw1097.eqiad.wmnet" # B7 eqiad
+ - "mw1216.eqiad.wmnet" # B8 eqiad
+ - "mw1161.eqiad.wmnet" # C6 eqiad
+ - "mw1201.eqiad.wmnet" # D5 eqiad
- "mw2080.codfw.wmnet" # B3 codfw
- "mw2119.codfw.wmnet" # B4 codfw
# - "mw2148.codfw.wmnet" # C3 codfw
diff --git a/manifests/site.pp b/manifests/site.pp
index 8403027..7831ebe 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2064,12 +2064,6 @@
role swift::storage
}
-# mw1009-1016 are jobrunners
-node /^mw10(09|1[0-6])\.eqiad\.wmnet$/ {
- role mediawiki::jobrunner
- include base::firewall
-}
-
# mw1017-mw1025 are canary appservers
node /^mw10(1[7-9]|2[0-5])\.eqiad\.wmnet$/ {
role mediawiki::canary_appserver
diff --git a/modules/scap/files/dsh/group/mediawiki-installation
b/modules/scap/files/dsh/group/mediawiki-installation
index 3b2c545..35573e1 100644
--- a/modules/scap/files/dsh/group/mediawiki-installation
+++ b/modules/scap/files/dsh/group/mediawiki-installation
@@ -20,14 +20,6 @@
snapshot1005.eqiad.wmnet
snapshot1006.eqiad.wmnet
snapshot1007.eqiad.wmnet
-mw1009.eqiad.wmnet
-mw1010.eqiad.wmnet
-mw1011.eqiad.wmnet
-mw1012.eqiad.wmnet
-mw1013.eqiad.wmnet
-mw1014.eqiad.wmnet
-mw1015.eqiad.wmnet
-mw1016.eqiad.wmnet
mw1017.eqiad.wmnet
mw1018.eqiad.wmnet
mw1019.eqiad.wmnet
--
To view, visit https://gerrit.wikimedia.org/r/297363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5571f3b370bf0e88fb84018d0f6210b3b12b928
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
