diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-12-27 18:18:31 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-12-27 18:18:31 -0200 |
| commit | 8d18a7c535d12ab4230b7ba6d3ec1ae7122d175f (patch) | |
| tree | 96c3b6ffaaa84e8e309446777a9c68394eeab5bb | |
| parent | 072a967c61eb6c0f3a9856ba0b393757c553a179 (diff) | |
| download | puppet-virtual-8d18a7c535d12ab4230b7ba6d3ec1ae7122d175f.tar.gz puppet-virtual-8d18a7c535d12ab4230b7ba6d3ec1ae7122d175f.tar.bz2 | |
Misc fixes
| -rw-r--r-- | manifests/vserver.pp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/manifests/vserver.pp b/manifests/vserver.pp index feda98e..a8a5a02 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -65,15 +65,15 @@ class vserver::host { file { "/usr/local/share/munin-plugins/vserver_resources": source => "puppet://$server/modules/virtual/munin/vserver_resources", - mode => 0755, owner => root, group => root; + mode => 0755, owner => root, group => root; "/usr/local/share/munin-plugins/vserver_cpu_": source => "puppet://$server/modules/virtual/munin/vserver_cpu_", - mode => 0755, owner => root, group => root; + mode => 0755, owner => root, group => root; "/usr/local/share/munin-plugins/vserver_loadavg": source => "puppet://$server/modules/virtual/munin/vserver_loadavg", - mode => 0755, owner => root, group => root; + mode => 0755, owner => root, group => root; } } } @@ -85,34 +85,35 @@ class vserver::host { # This creates a load average graph combining the individual load averages of each vserver on the host munin::plugin { "vserver_loadavg": - config => "user root\n", + config => "user root\n", script_path_in => "/usr/local/share/munin-plugins"; } # This creates a RSS graph for each vserver on the host (note after more than 4 vservers this can get noisy) munin::plugin { "vserver_resources_RSS": - ensure => "vserver_resources", - config => "user root\nenv.resource RSS", + ensure => "vserver_resources", + config => "user root\nenv.resource RSS", script_path_in => "/usr/local/share/munin-plugins"; } # This creates a VM graph for each vserver on the host (note after more than 4 vservers this can get noisy) munin::plugin { "vserver_resources_VM": - ensure => "vserver_resources", - config => "user root\nenv.resource VM", + ensure => "vserver_resources", + config => "user root\nenv.resource VM", script_path_in => "/usr/local/share/munin-plugins"; } # This creates a VM graph for each vserver on the host (note after more than 4 vservers this can get noisy) munin::plugin { "vserver_cpu_": - config => "user root\n", - script_path_in => "/usr/local/share/munin-plugins"; + config => "user root\n", + script_path_in => "/usr/local/share/munin-plugins"; } } } +} define vs_create($in_domain, $context, $legacy = false, $distro = 'etch', $debootstrap_mirror = 'http://ftp.debian.org/debian', $hostname = false, $interface = false) { |