Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377755 )

Change subject: logstash - ensure plugin directory is present
......................................................................

logstash - ensure plugin directory is present

Since we stopped deploying elasticsearch plugins to the logstash cluster,
the plugin directory should not be a symlink anymore, but a real directory.

Bug: T175045
Change-Id: I4290541e77af80219a958fa460c1e3694278e3e1
---
M modules/role/manifests/logstash/elasticsearch.pp
1 file changed, 4 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/377755/1

diff --git a/modules/role/manifests/logstash/elasticsearch.pp 
b/modules/role/manifests/logstash/elasticsearch.pp
index c6d33be..1be373c 100644
--- a/modules/role/manifests/logstash/elasticsearch.pp
+++ b/modules/role/manifests/logstash/elasticsearch.pp
@@ -20,19 +20,16 @@
         include ::elasticsearch::ganglia
     }
 
-    # 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,
+        ensure => 'directory',
         force  => true,
+        owner  => 'root',
+        group  => 'root',
+        mode   => '0755',
     }
 
     class { '::elasticsearch':
         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/377755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4290541e77af80219a958fa460c1e3694278e3e1
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

Reply via email to