Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341301 )
Change subject: Revert "elasticsearch requires $plugins_dir to exist"
......................................................................
Revert "elasticsearch requires $plugins_dir to exist"
This reverts commit 1afba3a851c1bdc99e498cc9d64dd46ce2d49c7b.
Change-Id: If7fa7f6dfde78467c4524a1ae47a5b82cdcd684e
---
M modules/elasticsearch/manifests/init.pp
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Gehel: Verified; Looks good to me, approved
diff --git a/modules/elasticsearch/manifests/init.pp
b/modules/elasticsearch/manifests/init.pp
index 4e1c18a..006fd53 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -151,10 +151,9 @@
# 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,
- require => File[$plugins_dir],
+ ensure => 'link',
+ target => $plugins_dir,
+ force => true,
}
file { '/etc/elasticsearch/elasticsearch.yml':
--
To view, visit https://gerrit.wikimedia.org/r/341301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7fa7f6dfde78467c4524a1ae47a5b82cdcd684e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
