Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: correctly assign the new codfw appservers in puppet
......................................................................
mediawiki: correctly assign the new codfw appservers in puppet
Bug: T135466
Change-Id: Ia041416144d6ebefbe2085b293510f6c420bdd98
---
M manifests/site.pp
1 file changed, 29 insertions(+), 7 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 8b9e665..6c54ba1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2176,14 +2176,13 @@
include base::firewall
}
-# ROW A codfw appservers: mw2061-mw2079, plus mw2017
+# ROW A codfw appservers: mw2017, mw2061-mw2079, and mw2215-2250
# mw2017.codfw.wmnet is a codfw test appserver
node 'mw2017.codfw.wmnet' {
role mediawiki::appserver
include base::firewall
}
-
#mw2061-2079 are api appservers
node /^mw20[6-7][0-9]\.codfw\.wmnet$/ {
@@ -2195,9 +2194,6 @@
# ROW B codfw appservers: mw2080-mw2147
#mw2080-mw2085 are jobrunners
node /^mw208[0-5]\.codfw\.wmnet$/ {
- if $::hostname == 'mw2080' {
- $ganglia_aggregator = true
- }
role mediawiki::jobrunner
include base::firewall
}
@@ -2243,12 +2239,38 @@
include base::firewall
}
-#mw2200-2234 are api appservers
-node /^mw22([0-2][0-9]|3[0-4])\.codfw\.wmnet$/ {
+#mw2200-2214 are api appservers
+node /^mw22(0[0-9]|1[0-4])\.codfw\.wmnet$/ {
role mediawiki::appserver::api
include base::firewall
}
+# New Appservers, in row A3/A4
+
+#mw2215-2220 are api appservers
+node /^mw22(1[5-9]|20)\.codfw\.wmnet$/ {
+ role mediawiki::appserver::api
+ include base::firewall
+}
+
+# mw2220-45 are appservers
+node /^mw22(20|3[0-9]|4[0-5])\.codfw\.wmnet$/ {
+ role mediawiki::appserver
+ include base::firewall
+}
+
+
+# mw2246 is a videoscaler
+node 'mw2246.codfw.wmnet' {
+ role mediawiki::videoscaler
+}
+
+# mw2247-2250 are jobrunners
+node /^mw22(4[7-9]|50)\.codfw\.wmnet$/ {
+ role mediawiki::jobrunner
+ include base::firewall
+}
+
node 'mx1001.wikimedia.org' {
role mail::mx
include standard
--
To view, visit https://gerrit.wikimedia.org/r/294023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia041416144d6ebefbe2085b293510f6c420bdd98
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[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
