Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375795 )
Change subject: logstash - stop deploying custom elasticsearch plugins
......................................................................
logstash - stop deploying custom elasticsearch plugins
For "historical reasons" we deploy the same plugins to the logstash cluster
than to the cirrus cluster. Those plugins aren't used by logstash, we should
just stop deploying them.
Bug: T174933
Change-Id: Ib75d10865216fa7cabee0afb1f1580c2233280c3
---
M modules/role/manifests/logstash/elasticsearch.pp
1 file changed, 4 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
DCausse: Looks good to me, but someone else must approve
Gehel: Looks good to me, approved
diff --git a/modules/role/manifests/logstash/elasticsearch.pp
b/modules/role/manifests/logstash/elasticsearch.pp
index a3bcdf1..c6d33be 100644
--- a/modules/role/manifests/logstash/elasticsearch.pp
+++ b/modules/role/manifests/logstash/elasticsearch.pp
@@ -20,25 +20,18 @@
include ::elasticsearch::ganglia
}
- package { 'elasticsearch/plugins':
- provider => 'trebuchet',
- }
# 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.
$plugins_dir = '/srv/deployment/elasticsearch/plugins'
file { '/usr/share/elasticsearch/plugins':
- ensure => 'link',
- target => $plugins_dir,
- force => true,
- require => Package['elasticsearch/plugins'],
+ ensure => 'link',
+ target => $plugins_dir,
+ force => true,
}
class { '::elasticsearch':
- require => [
- Package['elasticsearch/plugins'],
- File['/usr/share/elasticsearch/plugins'],
- ],
+ require => File['/usr/share/elasticsearch/plugins'],
plugins_dir => $plugins_dir,
curator_uses_unicast_hosts => false, # elasticsearch API is only
exposed to localhost
}
--
To view, visit https://gerrit.wikimedia.org/r/375795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib75d10865216fa7cabee0afb1f1580c2233280c3
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
