diff options
| -rw-r--r-- | Rakefile | 10 | ||||
| -rw-r--r-- | manifests/client/base.pp | 13 | ||||
| -rw-r--r-- | manifests/remoteplugin.pp | 6 |
3 files changed, 18 insertions, 11 deletions
@@ -5,10 +5,12 @@ require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-lint/tasks/puppet-lint' require 'rspec-system/rake_task' -PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "vendor/**/*.pp"] -PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}' -PuppetLint.configuration.send("disable_class_inherits_from_params_class") -PuppetLint.configuration.send("disable_80chars") +Rake::Task[:lint].clear +PuppetLint::RakeTask.new :lint do |config| + config.ignore_paths = ["spec/**/*.pp", "vendor/**/*.pp"] + config.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}' + config.disable_checks = [ "class_inherits_from_params_class", "80chars" ] +end # use librarian-puppet to manage fixtures instead of .fixtures.yml # offers more possibilities like explicit version management, forge downloads,... diff --git a/manifests/client/base.pp b/manifests/client/base.pp index d35d742..6ed0f71 100644 --- a/manifests/client/base.pp +++ b/manifests/client/base.pp @@ -4,11 +4,11 @@ class munin::client::base inherits munin::client::params { ensure => installed } service { 'munin-node': - ensure => running, - enable => true, - hasstatus => true, - hasrestart => true, - require => Package[munin-node], + ensure => running, + enable => true, + hasstatus => true, + hasrestart => true, + require => Package[munin-node], } file {'/etc/munin': ensure => directory, @@ -36,7 +36,8 @@ class munin::client::base inherits munin::client::params { use_ssh => $munin::client::use_ssh, description => $munin::client::description, group => $munin::client::munin_group, - config => [ 'use_node_name yes', 'load.load.warning 5', 'load.load.critical 10'], + config => [ 'use_node_name yes', 'load.load.warning 5', + 'load.load.critical 10'], export_tag => $munin::client::export_tag, } include munin::plugins::base diff --git a/manifests/remoteplugin.pp b/manifests/remoteplugin.pp index a2abf69..dc03c76 100644 --- a/manifests/remoteplugin.pp +++ b/manifests/remoteplugin.pp @@ -1,5 +1,9 @@ # Configure a munin remote plugin -define munin::remoteplugin($ensure = 'present', $source, $config = '') { +define munin::remoteplugin( + $source, + $ensure = 'present', + $config = '' +) { case $ensure { 'absent': { munin::plugin{ $name: ensure => absent } } default: { |