Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/254833
Change subject: RuboCop: Fixed Lint/UnusedBlockArgument offense ...................................................................... RuboCop: Fixed Lint/UnusedBlockArgument offense More information: https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars Bug: T112651 Change-Id: I6523610b51dddf544b659a61ed79b3ccffb87d3b --- M .rubocop_todo.yml M modules/base/files/monitoring/check_puppetrun M modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb 3 files changed, 3 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/33/254833/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 00cac4f..2dfe96a 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -26,14 +26,6 @@ Exclude: - 'modules/puppetmaster/lib/puppet/reports/logstash.rb' -# Offense count: 3 -# Cop supports --auto-correct. -# Configuration parameters: IgnoreEmptyBlocks. -Lint/UnusedBlockArgument: - Exclude: - - 'modules/base/files/monitoring/check_puppetrun' - - 'modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb' - # Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods. diff --git a/modules/base/files/monitoring/check_puppetrun b/modules/base/files/monitoring/check_puppetrun index c486a44..1521609 100755 --- a/modules/base/files/monitoring/check_puppetrun +++ b/modules/base/files/monitoring/check_puppetrun @@ -35,7 +35,7 @@ warn = f.to_i end -opt.on("--only-enabled", "-e", "Only alert if Puppet is enabled") do |f| +opt.on("--only-enabled", "-e", "Only alert if Puppet is enabled") do enabled_only = true end diff --git a/modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb b/modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb index 7a713ef..7b76b34 100644 --- a/modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb +++ b/modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb @@ -9,11 +9,11 @@ module Puppet::Parser::Functions - newfunction(:ganglia_aggregator_config, :type => :rvalue) do |args| + newfunction(:ganglia_aggregator_config, :type => :rvalue) do config = {} site_wide_aggregators = {} clusters = function_hiera(['ganglia_clusters']) - clusters.each do |cluster, data| + clusters.each do |_cluster, data| data['sites'].each do |site, aggregators| name = sprintf("%s %s", data['name'], site) if not aggregators.empty? -- To view, visit https://gerrit.wikimedia.org/r/254833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6523610b51dddf544b659a61ed79b3ccffb87d3b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Zfilipin <zfili...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
