Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/375812 )
Change subject: elasticsearch - deploy plugins with debian package instead of
trebuchet
......................................................................
elasticsearch - deploy plugins with debian package instead of trebuchet
Bug: T158560
Change-Id: I69322724369e4574a1d048cc4c75eaffdbc2b260
---
M modules/profile/manifests/elasticsearch.pp
1 file changed, 5 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/375812/1
diff --git a/modules/profile/manifests/elasticsearch.pp
b/modules/profile/manifests/elasticsearch.pp
index b84f3f9..74fb74d 100644
--- a/modules/profile/manifests/elasticsearch.pp
+++ b/modules/profile/manifests/elasticsearch.pp
@@ -48,9 +48,11 @@
srange => "@resolve((${elastic_nodes_ferm}))",
}
- package { 'elasticsearch/plugins':
- provider => 'trebuchet',
+ package {'wmf-elasticsearch-search-plugins':
+ ensure => present,
+ before => Service['elasticsearch'],
}
+
# Elasticsearch 5 doesn't allow setting the plugin path, we need
# to symlink it into place. The directory already exists as part of the
# debian package, so we need to force the creation of the symlink.
@@ -59,15 +61,11 @@
ensure => 'link',
target => $plugins_dir,
force => true,
- require => Package['elasticsearch/plugins'],
}
# Install
class { '::elasticsearch':
- require => [
- Package['elasticsearch/plugins'],
- File['/usr/share/elasticsearch/plugins'],
- ],
+ require =>
File['/usr/share/elasticsearch/plugins'],
# Production elasticsearch needs these plugins to be loaded in order
# to work properly. This will keep elasticsearch from starting
# if these plugins are not available.
--
To view, visit https://gerrit.wikimedia.org/r/375812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69322724369e4574a1d048cc4c75eaffdbc2b260
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
