Nikerabbit has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/344345 )
Change subject: Update ES to 5.1.2
......................................................................
Update ES to 5.1.2
Changes needed:
* Remove head (no longer supported)
* Update wikimedia extra
* Plugin syntax changed from slashes to colons
* Define module_dir because puppet fails to detect it and explodes
* Update elasticsearch submodule
* Migrate ES_HEAD_SIZE to jvm options
** I had to manually empty /etc/default/elasticsearch-es-01 to make
it disapper from there
* Remove listen on _local_, apparently the quotes added by puppet
confuses ES and makes it not listen on anything.
** Confirmed manually that the default is localhost:
tcp6 0 0 127.0.0.1:9200 :::* LISTEN
107 10321089 11923/java
tcp6 0 0 ::1:9200 :::* LISTEN
107 10321088 11923/java
Change-Id: I558ae184c01e27b961dd9d6ca5bb76503112f4fc
---
M puppet/modules/elasticsearch
M puppet/modules/profile/manifests/mwelasticsearch.pp
2 files changed, 11 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/45/344345/1
diff --git a/puppet/modules/elasticsearch b/puppet/modules/elasticsearch
index f814203..aa8c21d 160000
--- a/puppet/modules/elasticsearch
+++ b/puppet/modules/elasticsearch
@@ -1 +1 @@
-Subproject commit f814203dbae97d8dbe330f86cb5fc66016a13d4e
+Subproject commit aa8c21de803ed23386223c66cf516a4d5567dc33
diff --git a/puppet/modules/profile/manifests/mwelasticsearch.pp
b/puppet/modules/profile/manifests/mwelasticsearch.pp
index a31d7b1..9c12bfe 100644
--- a/puppet/modules/profile/manifests/mwelasticsearch.pp
+++ b/puppet/modules/profile/manifests/mwelasticsearch.pp
@@ -13,26 +13,19 @@
class { 'elasticsearch':
manage_repo => true,
- repo_version => '2.x',
+ repo_version => '5.x',
java_install => true,
- version => '2.3.4',
+ version => '5.1.2',
+ jvm_options => [
+ '-Xms8g',
+ '-Xmx10g'
+ ],
}
- elasticsearch::instance { 'es-01':
- config => {
- 'network.host' => '::1',
- 'index.max_result_window' => '20000',
- },
- init_defaults => {
- 'ES_HEAP_SIZE' => '12g',
- },
- }
+ elasticsearch::instance { 'es-01': }
- elasticsearch::plugin { 'mobz/elasticsearch-head/latest':
- instances => 'es-01',
- }
-
- elasticsearch::plugin { 'org.wikimedia.search/extra/2.3.4':
- instances => 'es-01',
+ elasticsearch::plugin { 'org.wikimedia.search:extra:5.1.2':
+ instances => 'es-01',
+ module_dir => 'extra'
}
}
--
To view, visit https://gerrit.wikimedia.org/r/344345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I558ae184c01e27b961dd9d6ca5bb76503112f4fc
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
