diff options
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | manifests/plugin.pp | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index dc646e7..966cdcb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -7,7 +7,7 @@ # Define where the individual nodes' configs are stored $NODESDIR="/var/lib/puppet/modules/munin/nodes" -modules_dir { [ "munin", "munin/nodes" ]: } +modules_dir { [ "munin", "munin/nodes", "munin/plugins" ]: } import "host.pp" import "client.pp" diff --git a/manifests/plugin.pp b/manifests/plugin.pp index fb2f882..fdb58ca 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -85,9 +85,17 @@ class munin::plugins::base { interfaces: source => "puppet://$servername/munin/facter/interfaces.rb", require => Package[iproute]; - acpi_available: - source => "puppet://$servername/munin/facter/acpi_available.rb", - require => Package[acpi]; + } + case $vserver { + guest: {} + '': {} + default: { + puppet::fact{ + acpi_available: + source => "puppet://$servername/munin/facter/acpi_available.rb", + require => Package[acpi]; + } + } } } |