unbreak v6 munin check

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 2ad9750..bb9e81b 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -22,7 +22,7 @@ class ferm {
 
        if $v6ips {
                $munin6_ips = split(regsubst($v6ips, '([^,]+)', 'ip_\1', 'G'), ',')
-               munin::check { $munin6_ips: script => 'ip_', }
+               munin::ipv6check { $munin6_ips: }
        }
 
        # get rid of old stuff

diff --git a/modules/munin/manifests/check.pp b/modules/munin/manifests/check.pp
index ee88ca0..d807861 100644 (file)
--- a/modules/munin/manifests/check.pp
+++ b/modules/munin/manifests/check.pp
@@ -1,5 +1,7 @@
 define munin::check($ensure = present, $script = undef) {
 
+       include munin
+
        if $script {
                $link = $script
        } else {

diff --git a/modules/munin/manifests/ipv6check.pp b/modules/munin/manifests/ipv6check.pp
new file mode 100644 (file)
index 0000000..c8bf1b7
--- /dev/null
+++ b/modules/munin/manifests/ipv6check.pp
@@ -0,0 +1,16 @@
+define munin::ipv6check($ensure = present) {
+
+       include munin
+
+       if ! ($ensure in [absent,present]) {
+               fail("unexpected ensure: ${ensure}")
+       }
+
+       file { "/etc/munin/plugins/${name}":
+               ensure  => $ensure,
+               content => "#!/bin/bash\n# This file is under puppet control\n. /usr/share/munin/plugins/ip_\n",
+               mode    => '0555',
+               require => Package['munin-node'],
+               notify  => Service['munin-node'],
+       }
+}