Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401482 )
Change subject: api: move mw1189-1200 to role::spare::system
..
api: move mw1189-1200 to role::spare::system
Also remove them from conftool
Bug: T183895
Change-Id: Ia25effaafda0d0f2656a94efc0584b03154fbde6
---
M conftool-data/node/eqiad.yaml
M manifests/site.pp
2 files changed, 4 insertions(+), 15 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml
index 8f54087..48d4950 100644
--- a/conftool-data/node/eqiad.yaml
+++ b/conftool-data/node/eqiad.yaml
@@ -25,17 +25,6 @@
mw1336.eqiad.wmnet: [apache2,nginx]
mw1337.eqiad.wmnet: [apache2,nginx]
api_appserver:
-mw1189.eqiad.wmnet: [apache2,nginx]
-mw1190.eqiad.wmnet: [apache2,nginx]
-mw1191.eqiad.wmnet: [apache2,nginx]
-mw1192.eqiad.wmnet: [apache2,nginx]
-mw1193.eqiad.wmnet: [apache2,nginx]
-mw1194.eqiad.wmnet: [apache2,nginx]
-mw1195.eqiad.wmnet: [apache2,nginx]
-mw1197.eqiad.wmnet: [apache2,nginx]
-mw1198.eqiad.wmnet: [apache2,nginx]
-mw1199.eqiad.wmnet: [apache2,nginx]
-mw1200.eqiad.wmnet: [apache2,nginx]
mw1201.eqiad.wmnet: [apache2,nginx]
mw1202.eqiad.wmnet: [apache2,nginx]
mw1203.eqiad.wmnet: [apache2,nginx]
diff --git a/manifests/site.pp b/manifests/site.pp
index ddfb6df..6604232 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1510,13 +1510,13 @@
role(mediawiki::canary_appserver)
}
-# mw1180-1188 are apaches
-node /^mw118[0-8]\.eqiad\.wmnet$/ {
+# mw1180-1200 are spares
+node /^mw1(1[8-9][0-9]|200)\.eqiad\.wmnet$/ {
role(spare::system)
}
-# mw1189-1208 are api apaches
-node /^mw1(189|19[0-9]|20[0-8])\.eqiad\.wmnet$/ {
+# mw1201-1208 are api apaches
+node /^mw120[1-8]\.eqiad\.wmnet$/ {
role(mediawiki::appserver::api)
}
--
To view, visit https://gerrit.wikimedia.org/r/401482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia25effaafda0d0f2656a94efc0584b03154fbde6
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Elukey
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
