Dzahn has submitted this change and it was merged.
Change subject: elasticsearch: lint fixes
......................................................................
elasticsearch: lint fixes
Hosts where compilation is identical:
elastic1001.eqiad.wmnet
http://puppet-compiler.wmflabs.org/479/change/170496/html/
Change-Id: I13dea5c6dbf4f4d2526af72d2ac415b23e44d94c
---
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/manifests/log/hot_threads.pp
M modules/elasticsearch/manifests/nagios/plugin.pp
M modules/elasticsearch/manifests/packages.pp
4 files changed, 19 insertions(+), 19 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/elasticsearch/manifests/init.pp
b/modules/elasticsearch/manifests/init.pp
index 0e05ea9..d1bde61 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -93,34 +93,34 @@
file { '/etc/elasticsearch/elasticsearch.yml':
ensure => file,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
content => template('elasticsearch/elasticsearch.yml.erb'),
mode => '0444',
require => Package['elasticsearch'],
}
file { '/etc/elasticsearch/logging.yml':
ensure => file,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
content => template('elasticsearch/logging.yml.erb'),
mode => '0444',
require => Package['elasticsearch'],
}
file { '/etc/default/elasticsearch':
ensure => file,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
content => template('elasticsearch/elasticsearch.erb'),
mode => '0444',
require => Package['elasticsearch'],
}
file { '/etc/logrotate.d/elasticsearch':
- ensure => file,
- owner => root,
- group => root,
- mode => '0444',
- source => 'puppet:///modules/elasticsearch/logrotate',
+ ensure => file,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/elasticsearch/logrotate',
}
# Note that we don't notify the Elasticsearch service of changes to its
# config files because you need to be somewhat careful when restarting it.
@@ -157,8 +157,8 @@
if ubuntu_version('>= trusty') {
file { '/usr/local/bin/es-tool':
ensure => file,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0755',
source => 'puppet:///modules/elasticsearch/es-tool',
require => Package['python-elasticsearch']
diff --git a/modules/elasticsearch/manifests/log/hot_threads.pp
b/modules/elasticsearch/manifests/log/hot_threads.pp
index d2969ad..3594226 100644
--- a/modules/elasticsearch/manifests/log/hot_threads.pp
+++ b/modules/elasticsearch/manifests/log/hot_threads.pp
@@ -4,15 +4,15 @@
#
class elasticsearch::log::hot_threads {
$script_name = 'elasticsearch_hot_threads_logger.py'
- $script = "/usr/local/bin/$script_name"
+ $script = "/usr/local/bin/${script_name}"
$log = '/var/log/elasticsearch/elasticsearch_hot_threads.log'
file { $script:
- source => "puppet:///modules/elasticsearch/$script_name",
+ source => "puppet:///modules/elasticsearch/${script_name}",
mode => '0555',
}
cron { 'elasticsearch-hot-threads-log':
- command => "python $script 2>&1 >> $log",
+ command => "python ${script} 2>&1 >> ${log}",
#So the destination directory exists
require => Package['elasticsearch'],
user => 'elasticsearch',
diff --git a/modules/elasticsearch/manifests/nagios/plugin.pp
b/modules/elasticsearch/manifests/nagios/plugin.pp
index 27b6fdf..d624b20 100644
--- a/modules/elasticsearch/manifests/nagios/plugin.pp
+++ b/modules/elasticsearch/manifests/nagios/plugin.pp
@@ -9,7 +9,7 @@
group => 'root',
mode => '0755',
require => Package['icinga'],
- tag => 'nagiosplugin'
+ tag => 'nagiosplugin'
}
# new version, can do more fine-grained checks
@@ -19,7 +19,7 @@
group => 'root',
mode => '0755',
require => Package['icinga'],
- tag => 'nagiosplugin'
+ tag => 'nagiosplugin'
}
package { 'python-requests':
diff --git a/modules/elasticsearch/manifests/packages.pp
b/modules/elasticsearch/manifests/packages.pp
index db87a1c..4886476 100644
--- a/modules/elasticsearch/manifests/packages.pp
+++ b/modules/elasticsearch/manifests/packages.pp
@@ -10,8 +10,8 @@
}
package { 'elasticsearch':
+ ensure => present,
require => Package['openjdk-7-jdk'],
- ensure => 'present',
}
if ! defined ( Package['curl'] ) {
--
To view, visit https://gerrit.wikimedia.org/r/170496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13dea5c6dbf4f4d2526af72d2ac415b23e44d94c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis <johnflewi...@gmail.com>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Manybubbles <never...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
