Rush has uploaded a new change for review.
https://gerrit.wikimedia.org/r/136150
Change subject: admin yaml for mw*
......................................................................
admin yaml for mw*
Change-Id: If10821c557eb1664aeb0f4796bff70f3bf7faac7
---
M manifests/site.pp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/136150/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 897cea6..05ca346 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1925,6 +1925,7 @@
# mw1017-1113 are apaches (precise)
node /^mw1(01[7-9]|0[2-9][0-9]|10[0-9]|11[0-3])\.eqiad\.wmnet$/ {
+ include admin
$cluster = 'appserver'
if $::hostname =~ /^mw101[78]$/ {
$ganglia_aggregator = true
@@ -1945,6 +1946,7 @@
# mw1114-1148 are api apaches (precise)
node /^mw11(1[4-9]|[23][0-9]|4[0-8])\.eqiad\.wmnet$/ {
+ include admin
$cluster = 'api_appserver'
if $::hostname =~ /^mw111[45]$/ {
$ganglia_aggregator = true
@@ -1955,6 +1957,7 @@
# mw1149-1152 are bits apaches (precise)
node /^mw11(49|5[0-2])\.eqiad\.wmnet$/ {
+ include admin
$cluster = 'bits_appserver'
if $::hostname =~ /^mw115[12]$/ {
$ganglia_aggregator = true
@@ -1965,6 +1968,7 @@
# mw1153-1160 are imagescalers (precise)
node /^mw11(5[3-9]|60)\.eqiad\.wmnet$/ {
+ include admin
$cluster = 'imagescaler'
if $::hostname =~ /^mw115[34]$/ {
$ganglia_aggregator = true
@@ -1975,6 +1979,7 @@
# mw1161-1188 are apaches (precise)
node /^mw11(6[1-9]|7[0-9]|8[0-8])\.eqiad\.wmnet$/ {
+ include admin
$cluster = 'appserver'
if $::hostname == 'mw1161' {
include misc::deployment::scap_proxy
@@ -1985,6 +1990,7 @@
# mw1189-1208 are api apaches (precise)
node /^mw1(189|19[0-9]|20[0-8])\.eqiad\.wmnet$/ {
+ include admin
$cluster = 'api_appserver'
if $::hostname == 'mw1201' {
include misc::deployment::scap_proxy
@@ -1995,6 +2001,7 @@
# mw1209-1220 are apaches (precise)
node /^mw12(09|1[0-9]|20)\.eqiad\.wmnet$/ {
+ include admin
$cluster = 'appserver'
include role::mediawiki::appserver
}
--
To view, visit https://gerrit.wikimedia.org/r/136150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If10821c557eb1664aeb0f4796bff70f3bf7faac7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
