Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/164517
Change subject: mediawiki: reimage mw1022 to HAT ...................................................................... mediawiki: reimage mw1022 to HAT Change-Id: I8571487a09cabc12c53ed4ad46f1b92bf879ba3f Signed-off-by: Giuseppe Lavagetto <[email protected]> --- M hieradata/hosts/mw1022.yaml M manifests/site.pp 2 files changed, 4 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/17/164517/1 diff --git a/hieradata/hosts/mw1022.yaml b/hieradata/hosts/mw1022.yaml index 2c726b4..e30aca3 100644 --- a/hieradata/hosts/mw1022.yaml +++ b/hieradata/hosts/mw1022.yaml @@ -1 +1 @@ -mainrole: appserver +mainrole: appserver_hhvm diff --git a/manifests/site.pp b/manifests/site.pp index 0f3073f..0f7f58d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2076,8 +2076,9 @@ include role::mediawiki::jobrunner } -#mw1017-1021 are apaches (trusty) -node /^mw10(1[7-9]|2[01])\.eqiad\.wmnet$/ { +# mw1017-1022 are apaches (trusty) +# mw1023-1052 are apaches (precise) +node /^mw10(1[7-9]|[2-4][0-9]|5[0-2])\.eqiad\.wmnet$/ { class {'::admin': groups => ['deployment']} $cluster = hiera('cluster') @@ -2089,14 +2090,6 @@ include role::mediawiki::appserver } -# mw1022-1052 are apaches (precise) -node /^mw10(2[2-9]|[3-4][0-9]|5[0-2])\.eqiad\.wmnet$/ { - - class {'::admin': groups => ['deployment']} - $cluster = 'appserver' - - include role::mediawiki::appserver -} # mw1054-1113 are apaches (precise) node /^mw1(05[4-9]|0[6-9][0-9]|10[0-9]|11[0-3])\.eqiad\.wmnet$/ { -- To view, visit https://gerrit.wikimedia.org/r/164517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8571487a09cabc12c53ed4ad46f1b92bf879ba3f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
