Nikerabbit has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398469 )
Change subject: Upgrade ElasticSearch to 5.5.2 ...................................................................... Upgrade ElasticSearch to 5.5.2 Also updating the puppet module Change-Id: I86aa25454885dac608f4867e08d4362bd10af1b0 --- M puppet/Puppetfile M puppet/Puppetfile.lock M puppet/modules/profile/manifests/mwelasticsearch.pp 3 files changed, 19 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/69/398469/1 diff --git a/puppet/Puppetfile b/puppet/Puppetfile index 5d62330..017ca1b 100644 --- a/puppet/Puppetfile +++ b/puppet/Puppetfile @@ -1,5 +1,6 @@ forge "https://forgeapi.puppetlabs.com"; mod 'puppetlabs-mysql', '5.1.0' -mod 'elastic-elasticsearch', '5.1.1' +mod 'elastic-elasticsearch', '6.0.0' mod 'thias-sysctl', '1.0.6' +mod 'puppetlabs-java', '2.3.0' diff --git a/puppet/Puppetfile.lock b/puppet/Puppetfile.lock index ac40070..f9c7986 100644 --- a/puppet/Puppetfile.lock +++ b/puppet/Puppetfile.lock @@ -1,22 +1,20 @@ FORGE remote: https://forgeapi.puppetlabs.com specs: - elastic-elasticsearch (5.1.1) - puppet-yum (>= 0.9.6) - puppetlabs-apt (< 3.0.0, >= 2.0.0) - puppetlabs-java (< 2.0.0, >= 1.0.0) + elastic-elasticsearch (6.0.0) + puppet-tea (< 1.0.0, >= 0.2.0) + puppetlabs-apt (< 5.0.0, >= 2.0.0) puppetlabs-stdlib (< 5.0.0, >= 4.6.0) richardc-datacat (< 1.0.0, >= 0.6.2) - puppet-staging (2.2.0) - puppet-yum (2.1.0) - puppetlabs-concat (< 5.0.0, >= 1.2.5) - puppetlabs-stdlib (< 5.0.0, >= 4.10.0) - puppetlabs-apt (2.4.0) - puppetlabs-stdlib (< 5.0.0, >= 4.13.0) - puppetlabs-concat (4.1.1) + puppet-archive (2.2.0) puppetlabs-stdlib (< 5.0.0, >= 4.13.1) - puppetlabs-java (1.6.0) - puppetlabs-stdlib (< 5.0.0, >= 2.4.0) + puppet-staging (2.2.0) + puppet-tea (0.2.0) + puppetlabs-apt (4.4.1) + puppetlabs-stdlib (< 5.0.0, >= 4.16.0) + puppetlabs-java (2.3.0) + puppet-archive (< 3.0.0, >= 1.1.0) + puppetlabs-stdlib (< 5.0.0, >= 4.13.1) puppetlabs-mysql (5.1.0) puppet-staging (< 3.0.0, >= 1.0.1) puppetlabs-stdlib (< 5.0.0, >= 3.2.0) @@ -27,7 +25,8 @@ thias-sysctl (1.0.6) DEPENDENCIES - elastic-elasticsearch (= 5.1.1) + elastic-elasticsearch (= 6.0.0) + puppetlabs-java (= 2.3.0) puppetlabs-mysql (= 5.1.0) thias-sysctl (= 1.0.6) diff --git a/puppet/modules/profile/manifests/mwelasticsearch.pp b/puppet/modules/profile/manifests/mwelasticsearch.pp index 9c12bfe..0335c33 100644 --- a/puppet/modules/profile/manifests/mwelasticsearch.pp +++ b/puppet/modules/profile/manifests/mwelasticsearch.pp @@ -11,11 +11,11 @@ notify => Service['nginx'], } + class { 'java': distribution => 'jre' } + class { 'elasticsearch': - manage_repo => true, repo_version => '5.x', - java_install => true, - version => '5.1.2', + version => '5.5.2', jvm_options => [ '-Xms8g', '-Xmx10g' @@ -24,7 +24,7 @@ elasticsearch::instance { 'es-01': } - elasticsearch::plugin { 'org.wikimedia.search:extra:5.1.2': + elasticsearch::plugin { 'org.wikimedia.search:extra:5.5.2.3': instances => 'es-01', module_dir => 'extra' } -- To view, visit https://gerrit.wikimedia.org/r/398469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I86aa25454885dac608f4867e08d4362bd10af1b0 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
