Filippo Giunchedi has submitted this change and it was merged. Change subject: fix require_package documentation and txstatsd/graphite usage ......................................................................
fix require_package documentation and txstatsd/graphite usage Change-Id: Icb2ff1e3b66d9b0a447b07cc313c9e5dc09d857c --- M modules/graphite/manifests/init.pp M modules/graphite/manifests/web.pp M modules/txstatsd/manifests/init.pp M modules/wmflib/lib/puppet/parser/functions/require_package.rb 4 files changed, 3 insertions(+), 10 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/modules/graphite/manifests/init.pp b/modules/graphite/manifests/init.pp index c794be3..6502af7 100644 --- a/modules/graphite/manifests/init.pp +++ b/modules/graphite/manifests/init.pp @@ -14,8 +14,7 @@ $storage_aggregation = {}, $storage_dir = '/var/lib/carbon', ) { - $deps = ['graphite-carbon', 'python-whisper'] - require_package($deps) + require_package('graphite-carbon', 'python-whisper') $carbon_service_defaults = { log_updates => false, diff --git a/modules/graphite/manifests/web.pp b/modules/graphite/manifests/web.pp index cff5f7d..1572609 100644 --- a/modules/graphite/manifests/web.pp +++ b/modules/graphite/manifests/web.pp @@ -45,8 +45,7 @@ ) { include ::graphite - $deps = ['memcached', 'python-memcache', 'graphite-web'] - require_package($deps) + require_package('memcached', 'python-memcache', 'graphite-web') file { '/etc/graphite/cors.py': source => 'puppet:///modules/graphite/cors.py', diff --git a/modules/txstatsd/manifests/init.pp b/modules/txstatsd/manifests/init.pp index 59e88c1..5df52c0 100644 --- a/modules/txstatsd/manifests/init.pp +++ b/modules/txstatsd/manifests/init.pp @@ -23,8 +23,7 @@ # } # class txstatsd($settings) { - $deps = ['python-txstatsd', 'python-twisted-web', 'graphite-carbon'] - require_package($deps) + require_package('python-txstatsd', 'python-twisted-web', 'graphite-carbon') file { '/etc/init/txstatsd.conf': source => 'puppet:///modules/txstatsd/txstatsd.conf', diff --git a/modules/wmflib/lib/puppet/parser/functions/require_package.rb b/modules/wmflib/lib/puppet/parser/functions/require_package.rb index 91d69cd..6ff2578 100644 --- a/modules/wmflib/lib/puppet/parser/functions/require_package.rb +++ b/modules/wmflib/lib/puppet/parser/functions/require_package.rb @@ -13,10 +13,6 @@ # # Multiple packages as arguments # require_package('redis-server', 'python-redis') # -# # Multiple packages as array -# $deps = [ 'redis-server', 'python-redis' ] -# require_package($deps) -# module Puppet::Parser::Functions newfunction(:require_package, :arity => -2) do |args| args.each do |package_name| -- To view, visit https://gerrit.wikimedia.org/r/172270 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb2ff1e3b66d9b0a447b07cc313c9e5dc09d857c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits