[MediaWiki-commits] [Gerrit] Make config file depend on elasticsearch package. - change (operations/puppet)

[Pyoungmeister (Code Review)]

Pyoungmeister has submitted this change and it was merged.

Change subject: Make config file depend on elasticsearch package.
......................................................................


Make config file depend on elasticsearch package.

Also very minor clean up for some config files.

Change-Id: I55ddd7aee2d23efd214d10a198a79a90231deb5c
---
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/templates/elasticsearch.yml.erb
M modules/elasticsearch/templates/logging.yml.erb
3 files changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Pyoungmeister: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index e97deab..e3f5c71 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -29,18 +29,21 @@
         content => template('elasticsearch/elasticsearch.yml.erb'),
         mode    => '0444',
         notify  => Service['elasticsearch'],
+        require => Package['elasticsearch'],
     }
     file { '/etc/elasticsearch/logging.yml':
         ensure  => file,
         content => template('elasticsearch/logging.yml.erb'),
         mode    => '0444',
         notify  => Service['elasticsearch'],
+        require => Package['elasticsearch'],
     }
     file { '/etc/default/elasticsearch':
         ensure  => file,
         content => template('elasticsearch/elasticsearch.erb'),
         mode    => '0444',
         notify  => Service['elasticsearch'],
+        require => Package['elasticsearch'],
     }
 
     # Keep service running
diff --git a/modules/elasticsearch/templates/elasticsearch.yml.erb 
b/modules/elasticsearch/templates/elasticsearch.yml.erb
index f7fd635..8b4a53d 100644
--- a/modules/elasticsearch/templates/elasticsearch.yml.erb
+++ b/modules/elasticsearch/templates/elasticsearch.yml.erb
@@ -282,7 +282,7 @@
 
 # Set to throttle throughput when recovering (eg. 100mb, by default unlimited):
 #
-# indices.recovery.max_bytes_per_sec: 0
+# indices.recovery.max_size_per_sec: 0
 
 # Set to limit the number of open concurrent streams when
 # recovering a shard from a peer:
diff --git a/modules/elasticsearch/templates/logging.yml.erb 
b/modules/elasticsearch/templates/logging.yml.erb
index 0d3a4bc..e4fa7e0 100644
--- a/modules/elasticsearch/templates/logging.yml.erb
+++ b/modules/elasticsearch/templates/logging.yml.erb
@@ -52,4 +52,4 @@
     datePattern: "'.'yyyy-MM-dd"
     layout:
       type: pattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
\ No newline at end of file
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I55ddd7aee2d23efd214d10a198a79a90231deb5c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Manybubbles <never...@wikimedia.org>
Gerrit-Reviewer: Faidon <fai...@wikimedia.org>
Gerrit-Reviewer: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

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