Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51785
Change subject: making eqiad search pool4 awesome
......................................................................
making eqiad search pool4 awesome
Change-Id: I275184257a521a912c649382ca7dffe02d46019e
---
M manifests/role/lucene.pp
M manifests/site.pp
2 files changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/51785/1
diff --git a/manifests/role/lucene.pp b/manifests/role/lucene.pp
index d9e09d3..fb8f298 100644
--- a/manifests/role/lucene.pp
+++ b/manifests/role/lucene.pp
@@ -36,10 +36,14 @@
},
# everything else
"pool4" => {
- "search1015" =>
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl', '*?'],
- "search1016" =>
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl', '*?'],
- "search1019" =>
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
- "search1020" =>
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
+ "search1015" => ['*?'],
+ "search1016" => ['*?'],
+ "search1019" =>
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl',
+ 'wikidatawiki',
'metawiki', 'enwiktionary',
+
'(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
+ "search1020" =>
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl',
+ 'wikidatawiki',
'metawiki', 'enwiktionary',
+
'(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
"search1021" =>
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.|jawiki.|zhwiki.))*.hl'],
"search1022" =>
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.|jawiki.|zhwiki.))*.hl'],
},
diff --git a/manifests/site.pp b/manifests/site.pp
index 078348b..3478437 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1137,6 +1137,7 @@
$sip['search_pool2'][$::site],
$sip['search_pool3'][$::site],
$sip['search_pool4'][$::site],
+ $sip['search_pool5'][$::site],
$sip['search_prefix'][$::site],
$sip['swift'][$::site],
$sip['parsoid'][$::site]
@@ -1989,6 +1990,11 @@
include role::lucene::front_end::pool4
}
+node /search10(19|20)\.eqiad\.wmnet/ {
+
+ include role::lucene::front_end::pool5
+}
+
node /search101[78]\.eqiad\.wmnet/ {
include role::lucene::front_end::prefix
--
To view, visit https://gerrit.wikimedia.org/r/51785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I275184257a521a912c649382ca7dffe02d46019e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher <afeld...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
