diff options
| -rw-r--r-- | manifests/openvpn.pp | 4 | ||||
| -rw-r--r-- | manifests/vserver.pp | 24 | ||||
| -rw-r--r-- | manifests/xen.pp | 14 |
3 files changed, 21 insertions, 21 deletions
diff --git a/manifests/openvpn.pp b/manifests/openvpn.pp index d4589ef..7745d38 100644 --- a/manifests/openvpn.pp +++ b/manifests/openvpn.pp @@ -14,10 +14,10 @@ class virtual::openvpn::base { class virtual::openvpn::host_base inherits virtual::openvpn::base { file { "/var/lib/puppet/modules/virtual/openvpn/create_interface": - source => "puppet://$servername/virtual/create_openvpn_interface", + source => "puppet://$server/modules/virtual/create_openvpn_interface", mode => 0755, owner => root, group => 0; "/var/lib/puppet/modules/virtual/openvpn/destroy_interface": - source => "puppet://$servername/virtual/destroy_openvpn_interface", + source => "puppet://$server/modules/virtual/destroy_openvpn_interface", mode => 0755, owner => root, group => 0; } } diff --git a/manifests/vserver.pp b/manifests/vserver.pp index 3609fb1..acd29f0 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -34,7 +34,7 @@ class vserver::host { require => File["/etc/vservers"]; "/usr/local/bin/build_vserver": - source => "puppet://$server/virtual/vserver/build_vserver", + source => "puppet://$server/modules/virtual/vserver/build_vserver", mode => 0755, owner => root, group => root, require => [ Package['util-vserver'], Package[debootstrap]]; @@ -56,6 +56,7 @@ class vserver::host { "/etc/modprobe.d/local-dummy": ensure => absent, mode => 0644, owner => root, group => root; +<<<<<<< HEAD:manifests/vserver.pp } # Setup some plugins if munin is enabled in the system @@ -64,16 +65,16 @@ class vserver::host { default: { file { "/usr/local/share/munin-plugins/vserver_resources": - source => "puppet://$server/virtual/munin/vserver_resources", - mode => 0755, owner => root, group => root; + source => "puppet://$server/modules/virtual/munin/vserver_resources", + mode => 0755, owner => root, group => root; "/usr/local/share/munin-plugins/vserver_cpu_": - source => "puppet://$server/virtual/munin/vserver_cpu_", - mode => 0755, owner => root, group => root; + source => "puppet://$server/modules/virtual/munin/vserver_cpu_", + mode => 0755, owner => root, group => root; "/usr/local/share/munin-plugins/vserver_loadavg": - source => "puppet://$server/virtual/munin/vserver_loadavg", - mode => 0755, owner => root, group => root; + source => "puppet://$server/modules/virtual/munin/vserver_loadavg", + mode => 0755, owner => root, group => root; } } } @@ -86,7 +87,7 @@ class vserver::host { munin::plugin { "vserver_loadavg": config => "user root\n", - script_path => "/usr/local/share/munin-plugins"; + 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) @@ -94,7 +95,7 @@ class vserver::host { "vserver_resources_RSS": ensure => "vserver_resources", config => "user root\nenv.resource RSS", - script_path => "/usr/local/share/munin-plugins"; + 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) @@ -102,18 +103,17 @@ class vserver::host { "vserver_resources_VM": ensure => "vserver_resources", config => "user root\nenv.resource VM", - script_path => "/usr/local/share/munin-plugins"; + 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 => "/usr/local/share/munin-plugins"; + 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) { diff --git a/manifests/xen.pp b/manifests/xen.pp index 6e2ea4c..301b316 100644 --- a/manifests/xen.pp +++ b/manifests/xen.pp @@ -5,10 +5,10 @@ class munin::plugins::xen { munin::remoteplugin { xen_mem: - source => "puppet://$server/virtual/munin/xen_mem", + source => "puppet://$server/modules/virtual/munin/xen_mem", config => "user root"; xen_vm: - source => "puppet://$server/virtual/munin/xen_vm", + source => "puppet://$server/modules/virtual/munin/xen_vm", config => "user root"; } } @@ -46,9 +46,9 @@ class xen::domain::base { "puppet://$server/files/virtual/xen/config/${operatingsystem}/xend-config.sxp", "puppet://$server/files/virtual/xen/config/${operatingsystem}/$lsbdistcodename/xend-config.sxp", "puppet://$server/files/virtual/xen/config/xend-config.sxp", - "puppet://$server/virtual/xen/config/${operatingsystem}/xend-config.sxp", - "puppet://$server/virtual/xen/config/${operatingsystem}/$lsbdistcodename/xend-config.sxp", - "puppet://$server/virtual/xen/config/xend-config.sxp" ], + "puppet://$server/modules/virtual/xen/config/${operatingsystem}/xend-config.sxp", + "puppet://$server/modules/virtual/xen/config/${operatingsystem}/$lsbdistcodename/xend-config.sxp", + "puppet://$server/modules/virtual/xen/config/xend-config.sxp" ], notify => Service['xend'], owner => root, group => 0, mode => 0644; } @@ -64,13 +64,13 @@ class xen::domain::centos inherits xen::domain::base { } file{'/etc/sysconfig/xend': - source => "puppet://$server/virtual/xen/${operatingsystem}/sysconfig/xend", + source => "puppet://$server/modules/virtual/xen/${operatingsystem}/sysconfig/xend", notify => Service['xend'], owner => root, group => 0, mode => 0644; } file{'/etc/sysconfig/xendomains': - source => "puppet://$server/virtual/xen/${operatingsystem}/sysconfig/xendomains", + source => "puppet://$server/modules/virtual/xen/${operatingsystem}/sysconfig/xendomains", owner => root, group => 0, mode => 0644; } |