Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/165696
Change subject: mediawiki: consolidate hosts in site.pp, convert mw1053 ...................................................................... mediawiki: consolidate hosts in site.pp, convert mw1053 Given no one is really working on the HHVM jobrunner at the moment, we repurpose it as a HAT appserver; this also allows us to consolidate site.pp a little bit. Change-Id: I5a524e17f71d42e3119f6b15ddc768d8b5efcacb Signed-off-by: Giuseppe Lavagetto <[email protected]> --- A hieradata/hosts/mw1053.yaml M manifests/site.pp 2 files changed, 5 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/96/165696/1 diff --git a/hieradata/hosts/mw1053.yaml b/hieradata/hosts/mw1053.yaml new file mode 100644 index 0000000..e30aca3 --- /dev/null +++ b/hieradata/hosts/mw1053.yaml @@ -0,0 +1 @@ +mainrole: appserver_hhvm diff --git a/manifests/site.pp b/manifests/site.pp index 87a706e..8a401a7 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1947,35 +1947,14 @@ include role::mediawiki::jobrunner } -# mw1053 is the HHVM jobrunner -node 'mw1053.eqiad.wmnet' { - class {'::admin': groups => ['deployment']} - $cluster = 'jobrunner' - - include role::mediawiki::jobrunner -} - -# mw1017-1022 are apaches (trusty) -# mw1023-1052 are apaches (precise) -node /^mw10(1[7-9]|[2-4][0-9]|5[0-2])\.eqiad\.wmnet$/ { +# mw1017-1022, mw1053 are apaches (trusty) +# mw1023-1113 are apaches (precise) +node /^mw1(01[7-9]|0[2-9][0-9]|10[0-9]|11[0-3])\.eqiad\.wmnet$/ { class {'::admin': groups => ['deployment']} - if $::hostname =~ /^mw101[78]$/ { - $ganglia_aggregator = true - } - - 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$/ { - - class {'::admin': groups => ['deployment']} - - if $::hostname =~ /^mw105[45]$/ { + if $::hostname =~ /^mw10(1[78]|5[45])$/ { $ganglia_aggregator = true } @@ -1985,7 +1964,6 @@ include role::mediawiki::appserver } - # mw1114-1148 are api apaches (precise) node /^mw11(1[4-9]|[23][0-9]|4[0-8])\.eqiad\.wmnet$/ { -- To view, visit https://gerrit.wikimedia.org/r/165696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a524e17f71d42e3119f6b15ddc768d8b5efcacb 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
