summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schmitt <david@schmitt.edv-bus.at>2007-10-06 10:11:47 +0200
committerDavid Schmitt <david@schmitt.edv-bus.at>2007-10-06 10:11:47 +0200
commit2521bf14457f6377d1fef1185ef93e2ba91180d2 (patch)
tree10d09d01f95a346fc3f76605d4cb1e9c93e3f8d0
parent5761bef98c65edbc51615b3d043c126b4abbd66f (diff)
common: remove hand made plugins install defines and use matt's plugins patch
This moves all facts and puppet plugins to the plugins/ directory of modules to get the benefits of Matt's plugins patch, that distributes these files before the configuration is requested. This reduces the number of configuration runs to convergence by one.
-rw-r--r--manifests/plugin.pp16
-rw-r--r--plugins/facter/acpi_available.rb (renamed from files/facter/acpi_available.rb)0
-rwxr-xr-xplugins/facter/interfaces.rb (renamed from files/facter/interfaces.rb)0
3 files changed, 0 insertions, 16 deletions
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index fdb58ca..e7e22d1 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -81,22 +81,6 @@ class munin::plugins::base {
notify => Service[munin-node];
}
- puppet::fact{
- interfaces:
- source => "puppet://$servername/munin/facter/interfaces.rb",
- require => Package[iproute];
- }
- case $vserver {
- guest: {}
- '': {}
- default: {
- puppet::fact{
- acpi_available:
- source => "puppet://$servername/munin/facter/acpi_available.rb",
- require => Package[acpi];
- }
- }
- }
}
# handle if_ and if_err_ plugins
diff --git a/files/facter/acpi_available.rb b/plugins/facter/acpi_available.rb
index 216f608..216f608 100644
--- a/files/facter/acpi_available.rb
+++ b/plugins/facter/acpi_available.rb
diff --git a/files/facter/interfaces.rb b/plugins/facter/interfaces.rb
index a498d64..a498d64 100755
--- a/files/facter/interfaces.rb
+++ b/plugins/facter/interfaces.rb