Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185621
Change subject: mediawiki: Move admin class inclusion from role to site.pp
......................................................................
mediawiki: Move admin class inclusion from role to site.pp
Because admin class doesn't work on labs at all, and
role::mediawiki::common is used in beta
Change-Id: Id3aff2217d9581a6b5d9bbe7682cd487109d2821
---
M manifests/role/mediawiki.pp
M manifests/site.pp
2 files changed, 26 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/185621/1
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index b8b5986..08c9165 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -6,7 +6,6 @@
class role::mediawiki::common {
include ::standard
- include ::admin
include ::geoip
include ::mediawiki
include ::nutcracker::monitoring
diff --git a/manifests/site.pp b/manifests/site.pp
index b7af190..028d2e7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1936,6 +1936,8 @@
# mw1001-1016 are jobrunners (precise)
node /^mw10(0[1-9]|1[0-6])\.eqiad\.wmnet$/ {
+ include ::admin
+
if $::hostname =~ /^mw100[12]$/ {
$ganglia_aggregator = true
}
@@ -1944,11 +1946,15 @@
# mw1017-mw1025 are canary appservers
node /^mw10(1[7-9]|2[0-5])\.eqiad\.wmnet$/ {
+ include ::admin
+
role mediawiki::canary_appserver
}
# mw1026-mw1113 are appservers
node /^mw1(02[6-9]|0[3-9][0-9]|10[0-9]|11[0-3])\.eqiad\.wmnet$/ {
+ include ::admin
+
if $::hostname =~ /^mw10(5[45])$/ {
$ganglia_aggregator = true
}
@@ -1958,6 +1964,8 @@
# mw1114-mw1119 are canary api appservers
node /^mw111[4-9]\.eqiad\.wmnet$/ {
+ include ::admin
+
if $::hostname =~ /^mw111[45]$/ {
$ganglia_aggregator = true
}
@@ -1966,23 +1974,31 @@
# mw1120-1148 are api apaches
node /^mw11([23][0-9]|4[0-8])\.eqiad\.wmnet$/ {
+ include ::admin
+
role mediawiki::appserver::api
}
# mw1149-1151 are apaches
node /^mw11(49|5[0-1])\.eqiad\.wmnet$/ {
+ include ::admin
+
role mediawiki::appserver
}
# mw1152 is (temporarily) the HAT imagescaler
node 'mw1152.eqiad.wmnet' {
+ include ::admin
+
role mediawiki::imagescaler
}
# mw1153-1160 are imagescalers (precise)
node /^mw11(5[3-9]|60)\.eqiad\.wmnet$/ {
+ include ::admin
+
if $::hostname =~ /^mw115[34]$/ {
$ganglia_aggregator = true
}
@@ -1992,26 +2008,36 @@
# mw1161-1188 are apaches
node /^mw11(6[1-9]|7[0-9]|8[0-8])\.eqiad\.wmnet$/ {
+ include ::admin
+
role mediawiki::appserver
}
# mw1189-1208 are api apaches
node /^mw1(189|19[0-9]|20[0-8])\.eqiad\.wmnet$/ {
+ include ::admin
+
role mediawiki::appserver::api
}
# mw1209-1220 are apaches
node /^mw12(09|1[0-9]|20)\.eqiad\.wmnet$/ {
+ include ::admin
+
role mediawiki::appserver
}
#mw1221-mw1235 are api apaches
node /^mw12(2[1-9]|3[0-5])\.eqiad\.wmnet$/ {
+ include ::admin
+
role mediawiki::appserver::api
}
#mw1236-mw1258 are apaches
node /^mw12(3[6-9]|4[0-9]|5[0-8])\.eqiad\.wmnet$/ {
+ include ::admin
+
role mediawiki::appserver
}
--
To view, visit https://gerrit.wikimedia.org/r/185621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3aff2217d9581a6b5d9bbe7682cd487109d2821
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
