Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223891
Change subject: Upgrade Elasticsearch
......................................................................
Upgrade Elasticsearch
Now that we've scheduled 1.6.0 to go to production lets upgrade vagrant!
Change-Id: I9a2d4f35d86e9077fceffa2a055673df8c3957ad
---
M puppet/modules/elasticsearch/manifests/init.pp
M puppet/modules/role/manifests/cirrussearch.pp
2 files changed, 17 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/91/223891/1
diff --git a/puppet/modules/elasticsearch/manifests/init.pp
b/puppet/modules/elasticsearch/manifests/init.pp
index e6d125c..08bc4bd 100644
--- a/puppet/modules/elasticsearch/manifests/init.pp
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -5,15 +5,24 @@
#
class elasticsearch {
package { 'elasticsearch':
- ensure => present,
+ ensure => '1.6.0',
}
require_package('openjdk-7-jre-headless')
+ file { '/var/run/elasticsearch/':
+ # Temporary and poor work around for
+ # https://github.com/elastic/elasticsearch/issues/11594
+ ensure => 'directory'
+ }
+
service { 'elasticsearch':
ensure => running,
enable => true,
- require => Package['elasticsearch', 'openjdk-7-jre-headless'],
+ require => [
+ Package['elasticsearch', 'openjdk-7-jre-headless'],
+ File['/var/run/elasticsearch/'],
+ ]
}
file { '/etc/default/elasticsearch':
diff --git a/puppet/modules/role/manifests/cirrussearch.pp
b/puppet/modules/role/manifests/cirrussearch.pp
index 0013970..549104a 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -16,19 +16,19 @@
## Analysis
elasticsearch::plugin { 'icu':
name => 'elasticsearch-analysis-icu',
- version => '2.3.0',
+ version => '2.6.0',
}
elasticsearch::plugin { 'kuromoji':
name => 'elasticsearch-analysis-kuromoji',
- version => '2.3.0',
+ version => '2.6.0',
}
elasticsearch::plugin { 'stempel':
name => 'elasticsearch-analysis-stempel',
- version => '2.3.0',
+ version => '2.6.0',
}
elasticsearch::plugin { 'smartcn':
name => 'elasticsearch-analysis-smartcn',
- version => '2.3.0',
+ version => '2.6.0',
}
elasticsearch::plugin { 'hebrew':
# Less stable then icu plugin
@@ -39,13 +39,13 @@
elasticsearch::plugin { 'highlighter':
group => 'org.wikimedia.search.highlighter',
name => 'experimental-highlighter-elasticsearch-plugin',
- version => '1.3.0',
+ version => '1.6.0',
}
## Trigram accelerated regular expressions, "safer" query, and friends
elasticsearch::plugin { 'extra':
group => 'org.wikimedia.search',
name => 'extra',
- version => '1.3.1',
+ version => '1.6.0',
}
mediawiki::wiki { 'cirrustest': }
--
To view, visit https://gerrit.wikimedia.org/r/223891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a2d4f35d86e9077fceffa2a055673df8c3957ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <never...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
