[MediaWiki-commits] [Gerrit] Diamond: Turn off lint check for quoted bools. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Diamond:  Turn off lint check for quoted bools.
......................................................................

Diamond:  Turn off lint check for quoted bools.

Bug: T113783
Change-Id: I6c802c2ea9d8962bcf31f640c01c170ba76834c8
---
M manifests/role/diamond.pp
M modules/diamond/manifests/collector/extendedexim.pp
M modules/diamond/manifests/collector/localcrontab.pp
M modules/diamond/manifests/init.pp
4 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/241244/1

diff --git a/manifests/role/diamond.pp b/manifests/role/diamond.pp
index 26762c6..99aad73 100644
--- a/manifests/role/diamond.pp
+++ b/manifests/role/diamond.pp
@@ -22,7 +22,10 @@
         keep_logs_for => $keep_logs_for,
         service       => $service,
         settings      => {
+            # lint:ignore:quoted_booleans
+            # Diamond needs its bools in string-literals.
             enabled => 'true',
+            # lint:endignore
             host    => $host,
             port    => '8125',
         },
diff --git a/modules/diamond/manifests/collector/extendedexim.pp 
b/modules/diamond/manifests/collector/extendedexim.pp
index aff8d58..e92aa1a 100644
--- a/modules/diamond/manifests/collector/extendedexim.pp
+++ b/modules/diamond/manifests/collector/extendedexim.pp
@@ -18,7 +18,10 @@
     $settings = {},
     $ensure   = present,
 ) {
+    # lint:ignore:quoted_booleans
+    # This is jammed straight into a config file, needs quoting.
     $default_settings = {'use_sudo' => 'true'}
+    # lint:endignore
     $merged_settings = merge($default_settings, $settings)
 
     diamond::collector { 'ExtendedExim':
diff --git a/modules/diamond/manifests/collector/localcrontab.pp 
b/modules/diamond/manifests/collector/localcrontab.pp
index a2c3a2a..1224d63 100644
--- a/modules/diamond/manifests/collector/localcrontab.pp
+++ b/modules/diamond/manifests/collector/localcrontab.pp
@@ -18,7 +18,11 @@
     $settings = {},
     $ensure   = present,
 ) {
+
+    # lint:ignore:quoted_booleans
+    # This is jammed straight into a config file, needs quoting.
     $default_settings = {'use_sudo' => 'true'}
+    # lint:endignore
     $merged_settings = merge($default_settings, $settings)
 
     diamond::collector { 'LocalCrontabCollector':
diff --git a/modules/diamond/manifests/init.pp 
b/modules/diamond/manifests/init.pp
index a873846..65e7437 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -105,8 +105,12 @@
 
     diamond::collector { 'CPU':
         settings => {
+            # lint:ignore:quoted_booleans
+            # As per comments above, these must be quoted for the config
+            #  file.
             percore   => 'false',
             normalize => 'true',
+            # lint:endignore
         },
     }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c802c2ea9d8962bcf31f640c01c170ba76834c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>

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