[MediaWiki-commits] [Gerrit] Require config file for staring Elasticsearch - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Require config file for staring Elasticsearch
..


Require config file for staring Elasticsearch

This should help prevent Elasticsearch from coming up with garbage config.
It isn't so bad if it comes up with default config files because it won't
join the cluster and cause it trouble but if it comes up with half the
config files changed then it'll join the cluster without enough heap space
and cause havoc.  This should prevent that, if not the service starting
with default configuration.

Change-Id: I03f260440b06078d7d6c51758297dcd94f1e6d2d
---
M modules/elasticsearch/manifests/init.pp
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved
  Matanya: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index 3780134..8e1d16f 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -101,7 +101,12 @@
 service { 'elasticsearch':
 ensure  => running,
 enable  => true,
-require => Package['elasticsearch'],
+require => [
+Package['elasticsearch'],
+File['/etc/elasticsearch/elasticsearch.yml'],
+File['/etc/elasticsearch/logging.yml'],
+File['/etc/default/elasticsearch'],
+],
 }
 
 # Make sure that some pesky, misleading log files aren't kept around

-- 
To view, visit https://gerrit.wikimedia.org/r/116743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I03f260440b06078d7d6c51758297dcd94f1e6d2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Manybubbles 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Matanya 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Require config file for staring Elasticsearch - change (operations/puppet)

[Manybubbles (Code Review)]

Manybubbles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/116743

Change subject: Require config file for staring Elasticsearch
..

Require config file for staring Elasticsearch

This should help prevent Elasticsearch from coming up with garbage config.
It isn't so bad if it comes up with default config files because it won't
join the cluster and cause it trouble but if it comes up with half the
config files changed then it'll join the cluster without enough heap space
and cause havoc.  This should prevent that, if not the service starting
with default configuration.

Change-Id: I03f260440b06078d7d6c51758297dcd94f1e6d2d
---
M modules/elasticsearch/manifests/init.pp
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/116743/1

diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index 3780134..8e1d16f 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -101,7 +101,12 @@
 service { 'elasticsearch':
 ensure  => running,
 enable  => true,
-require => Package['elasticsearch'],
+require => [
+Package['elasticsearch'],
+File['/etc/elasticsearch/elasticsearch.yml'],
+File['/etc/elasticsearch/logging.yml'],
+File['/etc/default/elasticsearch'],
+],
 }
 
 # Make sure that some pesky, misleading log files aren't kept around

-- 
To view, visit https://gerrit.wikimedia.org/r/116743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03f260440b06078d7d6c51758297dcd94f1e6d2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Manybubbles 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits