diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2009-12-27 17:48:08 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2009-12-27 17:48:08 -0200 |
| commit | fb09f12c8a838372b64304fb40f047671e020d27 (patch) | |
| tree | fa3aa86c22a22347492c15abd1d3302ee322b3dc /manifests/xen.pp | |
| parent | 615a9e08f69335d46695db4748725fcc5b4393b8 (diff) | |
| parent | 2163466a745fee4bb92d3e628343c2808dcf4bc3 (diff) | |
| download | puppet-virtual-fb09f12c8a838372b64304fb40f047671e020d27.tar.gz puppet-virtual-fb09f12c8a838372b64304fb40f047671e020d27.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/module_virtual
Conflicts:
manifests/vserver.pp
Diffstat (limited to 'manifests/xen.pp')
| -rw-r--r-- | manifests/xen.pp | 14 |
1 files changed, 7 insertions, 7 deletions
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; } |