[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch: Lint fixes

[Juniorsys (Code Review)]

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334281 )

Change subject: elasticsearch: Lint fixes
......................................................................

elasticsearch: Lint fixes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645

Change-Id: I26001c23a2cf4f2a763b5be407f2d5d04e46555d
---
M modules/elasticsearch/manifests/decommission.pp
M modules/elasticsearch/manifests/https.pp
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/manifests/nagios/plugin.pp
M modules/elasticsearch/manifests/proxy.pp
5 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/334281/1

diff --git a/modules/elasticsearch/manifests/decommission.pp 
b/modules/elasticsearch/manifests/decommission.pp
index 0668180..255769f 100644
--- a/modules/elasticsearch/manifests/decommission.pp
+++ b/modules/elasticsearch/manifests/decommission.pp
@@ -5,7 +5,7 @@
 class elasticsearch::decommission {
     # Remove package
     package { 'elasticsearch':
-        ensure  => absent
+        ensure  => absent,
     }
 
     # Remove configuration
diff --git a/modules/elasticsearch/manifests/https.pp 
b/modules/elasticsearch/manifests/https.pp
index 27c32f6..597a443 100644
--- a/modules/elasticsearch/manifests/https.pp
+++ b/modules/elasticsearch/manifests/https.pp
@@ -27,7 +27,7 @@
         validate_string($certificate_name)
     }
 
-    class { [ 'nginx', 'nginx::ssl' ]:
+    class { [ '::nginx', '::nginx::ssl' ]:
         ensure => $ensure,
     }
 
diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index 29b69e6..7b53209 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -156,7 +156,7 @@
         default => [],
     }
 
-    class { 'elasticsearch::packages':
+    class { '::elasticsearch::packages':
         java_package => $java_package,
     }
 
@@ -231,13 +231,13 @@
     # thus leaving old files with no useful information named in such a way 
that
     # someone might think they contain useful logs.
     file { '/var/log/elasticsearch/elasticsearch.log':
-        ensure => absent
+        ensure => absent,
     }
     file { '/var/log/elasticsearch/elasticsearch_index_indexing_slowlog.log':
-        ensure => absent
+        ensure => absent,
     }
     file { '/var/log/elasticsearch/elasticsearch_index_search_slowlog.log':
-        ensure => absent
+        ensure => absent,
     }
 
     # Cluster management tool, trusty only
@@ -248,7 +248,7 @@
             group   => 'root',
             mode    => '0755',
             source  => 'puppet:///modules/elasticsearch/es-tool',
-            require => [Package['python-elasticsearch'], 
Package['python-ipaddr']]
+            require => [Package['python-elasticsearch'], 
Package['python-ipaddr']],
         }
     }
 }
diff --git a/modules/elasticsearch/manifests/nagios/plugin.pp 
b/modules/elasticsearch/manifests/nagios/plugin.pp
index 8a86c77..e1e586a 100644
--- a/modules/elasticsearch/manifests/nagios/plugin.pp
+++ b/modules/elasticsearch/manifests/nagios/plugin.pp
@@ -8,7 +8,7 @@
       owner  => 'root',
       group  => 'root',
       mode   => '0755',
-      tag    => 'nagiosplugin'
+      tag    => 'nagiosplugin',
     }
 
     # new version, can do more fine-grained checks
@@ -17,7 +17,7 @@
       owner  => 'root',
       group  => 'root',
       mode   => '0755',
-      tag    => 'nagiosplugin'
+      tag    => 'nagiosplugin',
     }
 
     package { 'python-requests':
diff --git a/modules/elasticsearch/manifests/proxy.pp 
b/modules/elasticsearch/manifests/proxy.pp
index 80d200a..68e792b 100644
--- a/modules/elasticsearch/manifests/proxy.pp
+++ b/modules/elasticsearch/manifests/proxy.pp
@@ -6,7 +6,7 @@
 #
 class elasticsearch::proxy {
     nginx::site { 'elasticsearch-proxy':
-        source => 'puppet:///modules/elasticsearch/labs-es-proxy.nginx.conf'
+        source => 'puppet:///modules/elasticsearch/labs-es-proxy.nginx.conf',
     }
 
     ferm::service { 'http':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26001c23a2cf4f2a763b5be407f2d5d04e46555d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys <juniorsys_wikime...@outlook.com>

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