Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165466
Change subject: mediawiki: repool mw1163 for scap, convert to hhvm.
......................................................................
mediawiki: repool mw1163 for scap, convert to hhvm.
Change-Id: Id0013e4c08e366a16625c192be2cfaca8b750de7
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M hieradata/hosts/mw1163.yaml
M manifests/site.pp
M modules/dsh/files/group/mw-eqiad
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/165466/1
diff --git a/hieradata/hosts/mw1163.yaml b/hieradata/hosts/mw1163.yaml
index 2c726b4..e30aca3 100644
--- a/hieradata/hosts/mw1163.yaml
+++ b/hieradata/hosts/mw1163.yaml
@@ -1 +1 @@
-mainrole: appserver
+mainrole: appserver_hhvm
diff --git a/manifests/site.pp b/manifests/site.pp
index c07f036..baa237a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1985,7 +1985,6 @@
node /^mw1(05[4-9]|0[6-9][0-9]|10[0-9]|11[0-3])\.eqiad\.wmnet$/ {
class {'::admin': groups => ['deployment']}
- $cluster = 'appserver'
if $::hostname =~ /^mw105[45]$/ {
$ganglia_aggregator = true
@@ -2036,7 +2035,7 @@
node /^mw11(6[1-9]|7[0-9]|8[0-8])\.eqiad\.wmnet$/ {
class {'::admin': groups => ['deployment']}
- $cluster = 'appserver'
+
if $::hostname == 'mw1161' {
include misc::deployment::scap_proxy
}
diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad
index 19b0ed0..be6497c 100644
--- a/modules/dsh/files/group/mw-eqiad
+++ b/modules/dsh/files/group/mw-eqiad
@@ -160,6 +160,7 @@
mw1160
mw1161
mw1162
+mw1163
mw1164
mw1165
mw1166
--
To view, visit https://gerrit.wikimedia.org/r/165466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0013e4c08e366a16625c192be2cfaca8b750de7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
