From dab730ed6b0667d4356c0e8e21e37719ea977a93 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 15 Jul 2010 20:41:39 +0200 Subject: fixing weird class setup we had some weird class setup which caused some problems on 2.6 (see puppet bug #4242 for more info). This commit cleans that weird setup up and decouples a lot of things. --- manifests/plugins/dom0.pp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'manifests/plugins/dom0.pp') diff --git a/manifests/plugins/dom0.pp b/manifests/plugins/dom0.pp index 8d919c3..3be3e3f 100644 --- a/manifests/plugins/dom0.pp +++ b/manifests/plugins/dom0.pp @@ -1,9 +1,7 @@ -class munin::plugins::dom0 inherits munin::plugins::physical { - munin::plugin::deploy { "xen": config => "user root"} - munin::plugin::deploy { "xen-cpu": config => "user root"} - munin::plugin::deploy { "xen_memory": config => "user root"} - munin::plugin::deploy { "xen_mem": config => "user root"} - munin::plugin::deploy { "xen_vm": config => "user root"} - munin::plugin::deploy { "xen_vbd": config => "user root"} - munin::plugin::deploy { "xen_traffic_all": config => "user root"} +class munin::plugins::dom0 { + munin::plugin::deploy { + [ 'xen', 'xen-cpu', 'xen_memory', 'xen_mem', + 'xen_vm', 'xen_vbd' 'xen_traffic_all' ]: + config => 'user root'; + } } -- cgit v1.2.3 From 892232f7c419fed071b7b1bdb0e3a2b9482c7449 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 19 Jul 2010 21:41:55 +0200 Subject: fixing the actual problem --- manifests/plugins/dom0.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/plugins/dom0.pp') diff --git a/manifests/plugins/dom0.pp b/manifests/plugins/dom0.pp index 3be3e3f..ed4f62c 100644 --- a/manifests/plugins/dom0.pp +++ b/manifests/plugins/dom0.pp @@ -1,7 +1,7 @@ class munin::plugins::dom0 { munin::plugin::deploy { [ 'xen', 'xen-cpu', 'xen_memory', 'xen_mem', - 'xen_vm', 'xen_vbd' 'xen_traffic_all' ]: + 'xen_vm', 'xen_vbd', 'xen_traffic_all' ]: config => 'user root'; } } -- cgit v1.2.3