Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338781 )
Change subject: elasticsearch: force the creation of the plugins directory
symlink
......................................................................
elasticsearch: force the creation of the plugins directory symlink
This directory already exists as part of the .deb package, but is empty on
all our elasticsearch instances.
Change-Id: I5b3261d180efda61982b312ee40ccd94a9098a22
---
M modules/elasticsearch/manifests/init.pp
1 file changed, 8 insertions(+), 7 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/elasticsearch/manifests/init.pp
b/modules/elasticsearch/manifests/init.pp
index 50d9388..b171133 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -148,12 +148,13 @@
}
# Elasticsearch 5 doesn't allow setting the plugin path, we need
- # to symlink it into place
- # TODO: temporary fix, fix for real later
- # file { '/usr/share/elasticsearch/plugins':
- # ensure => 'link',
- # target => $plugins_dir,
- # }
+ # 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.
+ file { '/usr/share/elasticsearch/plugins':
+ ensure => 'link',
+ target => $plugins_dir,
+ force => true,
+ }
file { '/etc/elasticsearch/elasticsearch.yml':
ensure => file,
@@ -258,7 +259,7 @@
File['/etc/elasticsearch/log4j2.properties'],
File['/etc/elasticsearch/jvm.options'],
File['/etc/default/elasticsearch'],
- # File['/usr/share/elasticsearch/plugins'],
+ File['/usr/share/elasticsearch/plugins'],
File[$data_dir],
],
}
--
To view, visit https://gerrit.wikimedia.org/r/338781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b3261d180efda61982b312ee40ccd94a9098a22
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
